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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 0c42a85ca5a51aef9d30f18da5460047dcf2d9b5..cfd35b0fce0675042362537ecbb8bf1faf615f8a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -2053,7 +2053,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 6b1f0539ce9dbae855e1d53da9a86f577b54ebe4..5da14a3005b4875e1f768fe2c25e984ef427af8b 100644 (file)
--- 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)
 
        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 1250035175444354a9a5d32a69291915d885a0df..9163f5968a2fcea955e71fea602f0e21ce9e1384 100644 (file)
--- 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;
                /* Disable UVD pg */
                adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE;