Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bf5df3b authored by Nils Wallménius's avatar Nils Wallménius Committed by Alex Deucher
Browse files

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



Clean up leftover from radeon code.

Signed-off-by: default avatarNils Wallménius <nils.wallmenius@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4223cc3d

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -2053,7 +2053,6 @@ struct amdgpu_device { 
	struct amdgpu_sdma		sdma;



	/* uvd */

	bool				has_uvd;

	struct amdgpu_uvd		uvd;



	/* vce */

drivers/gpu/drm/amd/amdgpu/cik.c

+0 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/gpu/drm/amd/amdgpu/vi.c

+0 −4
Original line number Diff line number Diff line
@@ -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;