projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
amd
/
include
/
asic_reg
/
uvd
/
uvd_6_0_d.h
diff --git
a/drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h
b/drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h
index 6f6fb34742d299a46d2b8d50764a43f732d9de83..ec69869c55ff530da2b00a1dae3833896ce07b5b 100644
(file)
--- a/
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h
+++ b/
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h
@@
-111,6
+111,8
@@
#define mmUVD_MIF_RECON1_ADDR_CONFIG 0x39c5
#define ixUVD_MIF_SCLR_ADDR_CONFIG 0x4
#define mmUVD_JPEG_ADDR_CONFIG 0x3a1f
#define mmUVD_MIF_RECON1_ADDR_CONFIG 0x39c5
#define ixUVD_MIF_SCLR_ADDR_CONFIG 0x4
#define mmUVD_JPEG_ADDR_CONFIG 0x3a1f
+#define mmUVD_GP_SCRATCH8 0x3c0a
+#define mmUVD_GP_SCRATCH9 0x3c0b
#define mmUVD_GP_SCRATCH4 0x3d38
#endif /* UVD_6_0_D_H */
#define mmUVD_GP_SCRATCH4 0x3d38
#endif /* UVD_6_0_D_H */
This page took
0.024768 seconds
and
5
git commands to generate.