Commit b43aaee6 authored Nov 21, 2017 by Leo Liu Committed by Alex Deucher Nov 28, 2017

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



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: Leo Liu <leo.liu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Fixes: 95d0906f ("drm/amdgpu: add initial vcn support and decode tests")
Cc: stable@vger.kernel.org
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>

parent 4fbd8d19

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

+8 −12

Original line number	Diff line number	Diff line
		@@ -1572,18 +1572,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;