diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-02-08 05:54:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-02-08 06:05:52 +1000 |
| commit | 2dd27794b9d702a2d033ad7004855344fac82155 (patch) | |
| tree | c6c518b4e9870ed287f12abec728238cd75459a1 /drivers/gpu/drm/amd/amdgpu/vi.c | |
| parent | b8a89f530f5692c70778c965f0bc8f5a61fbe703 (diff) | |
| parent | fb4bbba2775399149ca902f31eb5c46cc7a8d8b8 (diff) | |
| download | linux-2dd27794b9d702a2d033ad7004855344fac82155.tar.gz linux-2dd27794b9d702a2d033ad7004855344fac82155.tar.xz | |
Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-next
A few more misc fixes for 4.16.
* 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: re-enable CGCG on CZ and disable on ST
drm/amdgpu: disable coarse grain clockgating for ST
drm/radeon: adjust tested variable
drm/amdgpu: remove WARN_ON when VM isn't found v2
drm/amdgpu: fix locking in vega10_ih_prescreen_iv
drm/amdgpu: fix another potential cause of VM faults
drm/amdgpu: use queue 0 for kiq ring
drm/ttm: Fix 'buf' pointer update in ttm_bo_vm_access_kmap() (v2)
drm/ttm: fix missing parameter change for ttm_bo_cleanup_refs
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vi.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index da2b99c2d95f..1e3e05a11f7a 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -1049,7 +1049,6 @@ static int vi_common_early_init(void *handle) AMD_CG_SUPPORT_GFX_CP_LS | AMD_CG_SUPPORT_GFX_CGTS | AMD_CG_SUPPORT_GFX_CGTS_LS | - AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_CGLS | AMD_CG_SUPPORT_BIF_LS | AMD_CG_SUPPORT_HDP_MGCG | |