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

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

commit b43aaee6 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 <>
Acked-by: default avatarAlex Deucher <>
Reviewed-by: default avatarChristian König <>
Signed-off-by: default avatarAlex Deucher <>
Fixes: 95d0906f ("drm/amdgpu: add initial vcn support and decode tests")
Reviewed-and-Tested-by: default avatarMichel Dänzer <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent d8f74d70
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment