drm/amdgpu: delete set-but-not-read member has_uvd from amdgpu_device

Submitted by Nils Wallménius on March 5, 2016, 5:59 a.m.

Details

Message ID 1457157591-2436-1-git-send-email-nils.wallmenius@gmail.com
State New
Headers show
Series "drm/amdgpu: delete set-but-not-read member has_uvd from amdgpu_device" ( rev: 2 ) in DRI devel

Not browsing as part of any series.

Commit Message

Nils Wallménius March 5, 2016, 5:59 a.m.
Clean up leftover from radeon code.

Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.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(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 0c42a85..cfd35b0 100644
--- 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 6b1f053..5da14a3 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)
 
 	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 1250035..9163f59 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;
 		/* Disable UVD pg */
 		adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE;

Comments

On Sat, Mar 5, 2016 at 12:59 AM, Nils Wallménius
<nils.wallmenius@gmail.com> wrote:
> Clean up leftover from radeon code.
>
> Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com>

Applied, thanks!

Alex

> ---
>  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 0c42a85..cfd35b0 100644
> --- 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 6b1f053..5da14a3 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)
>
>         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 1250035..9163f59 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;
>                 /* Disable UVD pg */
>                 adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE;
> --
> 2.7.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel