openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 95d0906f85 ("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>
This commit is contained in:
Leo Liu 2017-11-21 09:08:07 -05:00 committed by Alex Deucher
parent 4fbd8d194f
commit b43aaee69d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu.h
View File

@ -1572,18 +1572,14 @@ struct amdgpu_device {
/* sdma */ /* sdma */
struct amdgpu_sdma sdma; struct amdgpu_sdma sdma;
union {
struct {
/* uvd */ /* uvd */
struct amdgpu_uvd uvd; struct amdgpu_uvd uvd;
/* vce */ /* vce */
struct amdgpu_vce vce; struct amdgpu_vce vce;
};
/* vcn */ /* vcn */
struct amdgpu_vcn vcn; struct amdgpu_vcn vcn;
};
/* firmwares */ /* firmwares */
struct amdgpu_firmware firmware; struct amdgpu_firmware firmware;