diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3318-Revert-Revert-drm-amdgpu-fix-vcn_v1_0_dec_ring_emit_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3318-Revert-Revert-drm-amdgpu-fix-vcn_v1_0_dec_ring_emit_.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3318-Revert-Revert-drm-amdgpu-fix-vcn_v1_0_dec_ring_emit_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3318-Revert-Revert-drm-amdgpu-fix-vcn_v1_0_dec_ring_emit_.patch new file mode 100644 index 00000000..aefa7e45 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3318-Revert-Revert-drm-amdgpu-fix-vcn_v1_0_dec_ring_emit_.patch @@ -0,0 +1,58 @@ +From 060923594d38b4f8dae51d7da4eff946466b9f64 Mon Sep 17 00:00:00 2001 +From: Jim Qu <Jim.Qu@amd.com> +Date: Thu, 1 Feb 2018 15:22:19 +0800 +Subject: [PATCH 3318/4131] Revert "Revert "drm/amdgpu: fix + vcn_v1_0_dec_ring_emit_wreg"" + +This reverts commit afc0b4341ef6c918c1686cd4c62c1a8247f311bf. +--- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +index bdc0052..714605a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +@@ -917,6 +917,22 @@ static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, + vcn_v1_0_dec_vm_reg_wait(ring, data0, data1, mask); + } + ++static void vcn_v1_0_dec_ring_emit_wreg(struct amdgpu_ring *ring, ++ uint32_t reg, uint32_t val) ++{ ++ struct amdgpu_device *adev = ring->adev; ++ ++ amdgpu_ring_write(ring, ++ PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA0), 0)); ++ amdgpu_ring_write(ring, reg << 2); ++ amdgpu_ring_write(ring, ++ PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_DATA1), 0)); ++ amdgpu_ring_write(ring, val); ++ amdgpu_ring_write(ring, ++ PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_GPCOM_VCPU_CMD), 0)); ++ amdgpu_ring_write(ring, VCN_DEC_CMD_WRITE_REG << 1); ++} ++ + /** + * vcn_v1_0_enc_ring_get_rptr - get enc read pointer + * +@@ -1135,7 +1151,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { + .pad_ib = amdgpu_ring_generic_pad_ib, + .begin_use = amdgpu_vcn_ring_begin_use, + .end_use = amdgpu_vcn_ring_end_use, +- .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, ++ .emit_wreg = vcn_v1_0_dec_ring_emit_wreg, + }; + + static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { +@@ -1162,6 +1178,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { + .pad_ib = amdgpu_ring_generic_pad_ib, + .begin_use = amdgpu_vcn_ring_begin_use, + .end_use = amdgpu_vcn_ring_end_use, ++ .emit_wreg = vcn_v1_0_enc_ring_emit_wreg, + }; + + static void vcn_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev) +-- +2.7.4 + |