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

Commit 802328da authored by Leo Liu's avatar Leo Liu Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: move UVD/VCE and VCN structure out from union 



commit b43aaee69d4327d05e7624d9471c17d015b4d67d upstream.

With the enablement of VCN Dec and Enc from user space, User space queries
kernel for the IP information, if HW has UVD/VCE, the info comes from these
IP blocks, but this could end up mis-interpret for VCN when they are in the
union, the other way same when HW with VCN block.

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Fixes: 95d0906f ("drm/amdgpu: add initial vcn support and decode tests")
Reviewed-and-Tested-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8f74d70

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

+8 −12
Original line number Diff line number Diff line
@@ -1536,18 +1536,14 @@ struct amdgpu_device { 
	/* sdma */

	struct amdgpu_sdma		sdma;



	union {

		struct {

	/* uvd */

	struct amdgpu_uvd		uvd;



	/* vce */

	struct amdgpu_vce		vce;

		};



	/* vcn */

	struct amdgpu_vcn		vcn;

	};



	/* firmwares */

	struct amdgpu_firmware		firmware;