diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-26 15:34:42 -0500 |
| commit | 8e22e1b3499a446df48c2b26667ca36c55bf864c (patch) | |
| tree | 5329f98b3eb3c95a9dcbab0fa4f9b6e62f0e788d /drivers/gpu/drm/amd/amdgpu/si_enums.h | |
| parent | 00d3c14f14d51babd8aeafd5fa734ccf04f5ca3d (diff) | |
| parent | 64a577196d66b44e37384bc5c4d78c61f59d5b2a (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si_enums.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si_enums.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si_enums.h b/drivers/gpu/drm/amd/amdgpu/si_enums.h index fde2086246fa..dc9e0e6b4558 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_enums.h +++ b/drivers/gpu/drm/amd/amdgpu/si_enums.h | |||
| @@ -143,8 +143,8 @@ | |||
| 143 | #define RLC_CLEAR_STATE_DESCRIPTOR_OFFSET 0x3D | 143 | #define RLC_CLEAR_STATE_DESCRIPTOR_OFFSET 0x3D |
| 144 | 144 | ||
| 145 | #define TAHITI_GB_ADDR_CONFIG_GOLDEN 0x12011003 | 145 | #define TAHITI_GB_ADDR_CONFIG_GOLDEN 0x12011003 |
| 146 | #define VERDE_GB_ADDR_CONFIG_GOLDEN 0x12010002 | 146 | #define VERDE_GB_ADDR_CONFIG_GOLDEN 0x02010002 |
| 147 | #define HAINAN_GB_ADDR_CONFIG_GOLDEN 0x02010001 | 147 | #define HAINAN_GB_ADDR_CONFIG_GOLDEN 0x02011003 |
| 148 | 148 | ||
| 149 | #define PACKET3(op, n) ((RADEON_PACKET_TYPE3 << 30) | \ | 149 | #define PACKET3(op, n) ((RADEON_PACKET_TYPE3 << 30) | \ |
| 150 | (((op) & 0xFF) << 8) | \ | 150 | (((op) & 0xFF) << 8) | \ |