diff options
| author | Leo Liu <leo.liu@amd.com> | 2015-09-10 13:41:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-22 14:49:25 -0700 |
| commit | 3512d8e6391dd0784f685a7c81ef5721c73f8e15 (patch) | |
| tree | de3a64900ad7522e7dcc26d275120714e431903a /drivers | |
| parent | d03fd6879317f1c6ef3dfab398a6bc8aaf18f58e (diff) | |
| download | lwn-3512d8e6391dd0784f685a7c81ef5721c73f8e15.tar.gz lwn-3512d8e6391dd0784f685a7c81ef5721c73f8e15.zip | |
drm/amdgpu: Disable UVD PG
commit 1ee4478a26cf55c8f8a6219d7e99f2b48959394d upstream.
This causes problems with multiple suspend/resume cycles.
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 68552da40287..4f58a1e18de6 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -1290,7 +1290,8 @@ static int vi_common_early_init(void *handle) case CHIP_CARRIZO: adev->has_uvd = true; adev->cg_flags = 0; - adev->pg_flags = AMDGPU_PG_SUPPORT_UVD | AMDGPU_PG_SUPPORT_VCE; + /* Disable UVD pg */ + adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE; adev->external_rev_id = adev->rev_id + 0x1; if (amdgpu_smc_load_fw && smc_enabled) adev->firmware.smu_load = true; |