diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0342-drm-amdgpu-delete-set-but-not-read-member-has_uvd-fr.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0342-drm-amdgpu-delete-set-but-not-read-member-has_uvd-fr.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0342-drm-amdgpu-delete-set-but-not-read-member-has_uvd-fr.patch b/common/recipes-kernel/linux/files/0342-drm-amdgpu-delete-set-but-not-read-member-has_uvd-fr.patch new file mode 100644 index 00000000..dffb851a --- /dev/null +++ b/common/recipes-kernel/linux/files/0342-drm-amdgpu-delete-set-but-not-read-member-has_uvd-fr.patch @@ -0,0 +1,78 @@ +From ce7f3a3cb7c929fba8aec40d490cb7dcd62c812a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= <nils.wallmenius@gmail.com> +Date: Sat, 5 Mar 2016 06:59:51 +0100 +Subject: [PATCH 0342/1110] drm/amdgpu: delete set-but-not-read member has_uvd + from amdgpu_device +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Clean up leftover from radeon code. + +Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/cik.c | 2 -- + drivers/gpu/drm/amd/amdgpu/vi.c | 4 ---- + 3 files changed, 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index ca1223f..05d525d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -2017,7 +2017,6 @@ struct amdgpu_device { + struct amdgpu_sdma sdma; + + /* uvd */ +- bool has_uvd; + struct amdgpu_uvd uvd; + + /* vce */ +diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c +index 192ab13..bddc9ba 100644 +--- a/drivers/gpu/drm/amd/amdgpu/cik.c ++++ b/drivers/gpu/drm/amd/amdgpu/cik.c +@@ -2028,8 +2028,6 @@ static int cik_common_early_init(void *handle) + + adev->asic_funcs = &cik_asic_funcs; + +- adev->has_uvd = true; +- + adev->rev_id = cik_get_rev_id(adev); + adev->external_rev_id = 0xFF; + switch (adev->asic_type) { +diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c +index b72cf06..1c120ef 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vi.c ++++ b/drivers/gpu/drm/amd/amdgpu/vi.c +@@ -1071,26 +1071,22 @@ static int vi_common_early_init(void *handle) + adev->external_rev_id = 0xFF; + switch (adev->asic_type) { + case CHIP_TOPAZ: +- adev->has_uvd = false; + adev->cg_flags = 0; + adev->pg_flags = 0; + adev->external_rev_id = 0x1; + break; + case CHIP_FIJI: +- adev->has_uvd = true; + adev->cg_flags = 0; + adev->pg_flags = 0; + adev->external_rev_id = adev->rev_id + 0x3c; + break; + case CHIP_TONGA: +- adev->has_uvd = true; + adev->cg_flags = 0; + adev->pg_flags = 0; + adev->external_rev_id = adev->rev_id + 0x14; + break; + case CHIP_CARRIZO: + case CHIP_STONEY: +- adev->has_uvd = true; + adev->cg_flags = 0; + adev->pg_flags = 0; + adev->external_rev_id = adev->rev_id + 0x1; +-- +2.7.4 + |