aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorNils Wallménius <nils.wallmenius@gmail.com>2016-03-05 00:59:51 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:39 -0500
commit0bf5df3b58e152ba2a50f9918f31a9c15b479b64 (patch)
treef3541187225f1af9109fdd894dd4a219294b8444 /drivers/gpu/drm/amd/amdgpu
parent4223cc3de2c4de880a945f265d9e24cbd01b2293 (diff)
drm/amdgpu: delete set-but-not-read member has_uvd from amdgpu_device
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/cik.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vi.c4
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 0c42a85ca5a5..cfd35b0fce06 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -2053,7 +2053,6 @@ struct amdgpu_device {
2053 struct amdgpu_sdma sdma; 2053 struct amdgpu_sdma sdma;
2054 2054
2055 /* uvd */ 2055 /* uvd */
2056 bool has_uvd;
2057 struct amdgpu_uvd uvd; 2056 struct amdgpu_uvd uvd;
2058 2057
2059 /* vce */ 2058 /* vce */
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 6b1f0539ce9d..5da14a3005b4 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -2025,8 +2025,6 @@ static int cik_common_early_init(void *handle)
2025 2025
2026 adev->asic_funcs = &cik_asic_funcs; 2026 adev->asic_funcs = &cik_asic_funcs;
2027 2027
2028 adev->has_uvd = true;
2029
2030 adev->rev_id = cik_get_rev_id(adev); 2028 adev->rev_id = cik_get_rev_id(adev);
2031 adev->external_rev_id = 0xFF; 2029 adev->external_rev_id = 0xFF;
2032 switch (adev->asic_type) { 2030 switch (adev->asic_type) {
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 125003517544..9163f5968a2f 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)
1071 adev->external_rev_id = 0xFF; 1071 adev->external_rev_id = 0xFF;
1072 switch (adev->asic_type) { 1072 switch (adev->asic_type) {
1073 case CHIP_TOPAZ: 1073 case CHIP_TOPAZ:
1074 adev->has_uvd = false;
1075 adev->cg_flags = 0; 1074 adev->cg_flags = 0;
1076 adev->pg_flags = 0; 1075 adev->pg_flags = 0;
1077 adev->external_rev_id = 0x1; 1076 adev->external_rev_id = 0x1;
1078 break; 1077 break;
1079 case CHIP_FIJI: 1078 case CHIP_FIJI:
1080 adev->has_uvd = true;
1081 adev->cg_flags = 0; 1079 adev->cg_flags = 0;
1082 adev->pg_flags = 0; 1080 adev->pg_flags = 0;
1083 adev->external_rev_id = adev->rev_id + 0x3c; 1081 adev->external_rev_id = adev->rev_id + 0x3c;
1084 break; 1082 break;
1085 case CHIP_TONGA: 1083 case CHIP_TONGA:
1086 adev->has_uvd = true;
1087 adev->cg_flags = 0; 1084 adev->cg_flags = 0;
1088 adev->pg_flags = 0; 1085 adev->pg_flags = 0;
1089 adev->external_rev_id = adev->rev_id + 0x14; 1086 adev->external_rev_id = adev->rev_id + 0x14;
1090 break; 1087 break;
1091 case CHIP_CARRIZO: 1088 case CHIP_CARRIZO:
1092 case CHIP_STONEY: 1089 case CHIP_STONEY:
1093 adev->has_uvd = true;
1094 adev->cg_flags = 0; 1090 adev->cg_flags = 0;
1095 /* Disable UVD pg */ 1091 /* Disable UVD pg */
1096 adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE; 1092 adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE;