diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2230-drm-amdgpu-move-UVD-VCE-and-VCN-structure-out-from-u.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2230-drm-amdgpu-move-UVD-VCE-and-VCN-structure-out-from-u.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2230-drm-amdgpu-move-UVD-VCE-and-VCN-structure-out-from-u.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2230-drm-amdgpu-move-UVD-VCE-and-VCN-structure-out-from-u.patch new file mode 100644 index 00000000..2259a9c9 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2230-drm-amdgpu-move-UVD-VCE-and-VCN-structure-out-from-u.patch @@ -0,0 +1,55 @@ +From 9a84345d4a688ba067ad9e21190163cb5eb86ad7 Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo.liu@amd.com> +Date: Tue, 21 Nov 2017 09:08:07 -0500 +Subject: [PATCH 2230/4131] drm/amdgpu: move UVD/VCE and VCN structure out from + union +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 20 ++++++++------------ + 1 file changed, 8 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 73fd36b..52c2a6e 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1655,18 +1655,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; +- }; ++ /* uvd */ ++ struct amdgpu_uvd uvd; ++ ++ /* vce */ ++ struct amdgpu_vce vce; ++ ++ /* vcn */ ++ struct amdgpu_vcn vcn; + + /* firmwares */ + struct amdgpu_firmware firmware; +-- +2.7.4 + |