diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-13 22:14:40 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-13 22:15:02 -0400 |
| commit | 0f1d37e65a59e9db33ab85f6e2c9784768ef80f4 (patch) | |
| tree | 6c2565da62d903007b0184905658480c88236034 /drivers/gpu/drm/amd/amdgpu | |
| parent | ad7ad48e09871e7bf6d75db80243f2abb30b4db9 (diff) | |
| parent | f7b1844bacecca96dd8d813675e4d8adec02cd66 (diff) | |
Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next
- Update golden regs for gfx9
- Powerplay fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190313194249.3346-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 5533f6e4f4a4..d0309e8c9d12 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | |||
| @@ -220,6 +220,7 @@ static const struct soc15_reg_golden golden_settings_gc_9_1_rv2[] = | |||
| 220 | 220 | ||
| 221 | static const struct soc15_reg_golden golden_settings_gc_9_x_common[] = | 221 | static const struct soc15_reg_golden golden_settings_gc_9_x_common[] = |
| 222 | { | 222 | { |
| 223 | SOC15_REG_GOLDEN_VALUE(GC, 0, mmCP_SD_CNTL, 0xffffffff, 0x000001ff), | ||
| 223 | SOC15_REG_GOLDEN_VALUE(GC, 0, mmGRBM_CAM_INDEX, 0xffffffff, 0x00000000), | 224 | SOC15_REG_GOLDEN_VALUE(GC, 0, mmGRBM_CAM_INDEX, 0xffffffff, 0x00000000), |
| 224 | SOC15_REG_GOLDEN_VALUE(GC, 0, mmGRBM_CAM_DATA, 0xffffffff, 0x2544c382) | 225 | SOC15_REG_GOLDEN_VALUE(GC, 0, mmGRBM_CAM_DATA, 0xffffffff, 0x2544c382) |
| 225 | }; | 226 | }; |