diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-04 11:43:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-04 11:43:14 +1000 |
| commit | 5669b9989eaa664cacbad6a85631550bccdad963 (patch) | |
| tree | aab12dbe8485398ab4e4b8d36d674098c2b2ba2d /drivers/gpu/drm/amd/amdgpu/si.c | |
| parent | 16f73eb02d7e1765ccab3d2018e0bd98eb93d973 (diff) | |
| parent | 68c9793d63e02f0683fdbf5e82d148d72ed1dbe0 (diff) | |
| download | linux-5669b9989eaa664cacbad6a85631550bccdad963.tar.bz2 | |
Merge branch 'drm-fixes-4.13' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Just a few small fixes for 4.13.
* 'drm-fixes-4.13' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: Use list_del_init in amdgpu_mn_unregister
drm/amdgpu: Fix undue fallthroughs in golden registers initialization
drm/amdgpu: fix header on gfx9 clear state
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index f45fb0f022b3..4267fa417997 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -1385,6 +1385,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev) amdgpu_program_register_sequence(adev, pitcairn_mgcg_cgcg_init, (const u32)ARRAY_SIZE(pitcairn_mgcg_cgcg_init)); + break; case CHIP_VERDE: amdgpu_program_register_sequence(adev, verde_golden_registers, @@ -1409,6 +1410,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev) amdgpu_program_register_sequence(adev, oland_mgcg_cgcg_init, (const u32)ARRAY_SIZE(oland_mgcg_cgcg_init)); + break; case CHIP_HAINAN: amdgpu_program_register_sequence(adev, hainan_golden_registers, |