diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:29:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:29:55 +0100 |
| commit | c21b04f9890ce35bfbb4f5ee1937017613f66017 (patch) | |
| tree | 0f15558258d2d67f8149d3378b0e6bb83f0d8a35 /drivers/gpu/drm/amd/amdgpu/vi.c | |
| parent | firmware: qemu config needs I/O ports (diff) | |
| parent | Linux 4.5-rc4 (diff) | |
| download | linux-c21b04f9890ce35bfbb4f5ee1937017613f66017.tar.xz linux-c21b04f9890ce35bfbb4f5ee1937017613f66017.zip | |
Merge 4.5-rc4 into driver-core-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vi.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 89f5a1ff6f43..0d14d108a6c4 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -1457,8 +1457,7 @@ static int vi_common_early_init(void *handle) case CHIP_STONEY: adev->has_uvd = true; adev->cg_flags = 0; - /* Disable UVD pg */ - adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE; + adev->pg_flags = 0; adev->external_rev_id = adev->rev_id + 0x1; break; default: |