drm/amdgpu: move UVD/VCE and VCN structure out from union
authorLeo Liu <leo.liu@amd.com>
Tue, 21 Nov 2017 14:08:07 +0000 (09:08 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Dec 2017 10:26:37 +0000 (11:26 +0100)
commit802328da073a0ba36a1cde899c48a5f07732d4aa
tree5424707b38f0592fef45503b599077c59adbc5cf
parentd8f74d70634aa0dfe063d0e445f683b0545fa5b8
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: 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: 95d0906f8506 ("drm/amdgpu: add initial vcn support and decode tests")
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/amdgpu/amdgpu.h