diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0514-drm-amdgpu-vcn-Reduce-unnecessary-local-variable.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0514-drm-amdgpu-vcn-Reduce-unnecessary-local-variable.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0514-drm-amdgpu-vcn-Reduce-unnecessary-local-variable.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0514-drm-amdgpu-vcn-Reduce-unnecessary-local-variable.patch new file mode 100644 index 00000000..f23ddb1a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0514-drm-amdgpu-vcn-Reduce-unnecessary-local-variable.patch @@ -0,0 +1,58 @@ +From 252b1767ac05bc6f91a3e335f784ecff93cf7679 Mon Sep 17 00:00:00 2001 +From: James Zhu <James.Zhu@amd.com> +Date: Thu, 4 Oct 2018 09:29:22 -0400 +Subject: [PATCH 0514/2940] drm/amdgpu/vcn:Reduce unnecessary local variable + +Reduce unnecessary local variable. + +Signed-off-by: James Zhu <James.Zhu@amd.com> +Acked-by: Leo Liu <leo.liu@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +index a6094868008c..e597116d8282 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +@@ -938,7 +938,7 @@ static int vcn_v1_0_start_spg_mode(struct amdgpu_device *adev) + static int vcn_v1_0_start_dpg_mode(struct amdgpu_device *adev) + { + struct amdgpu_ring *ring = &adev->vcn.ring_dec; +- uint32_t rb_bufsz, tmp, reg_data; ++ uint32_t rb_bufsz, tmp; + uint32_t lmi_swap_cntl; + + /* disable byte swapping */ +@@ -947,19 +947,19 @@ static int vcn_v1_0_start_dpg_mode(struct amdgpu_device *adev) + vcn_1_0_enable_static_power_gating(adev); + + /* enable dynamic power gating mode */ +- reg_data = RREG32_SOC15(UVD, 0, mmUVD_POWER_STATUS); +- reg_data |= UVD_POWER_STATUS__UVD_PG_MODE_MASK; +- reg_data |= UVD_POWER_STATUS__UVD_PG_EN_MASK; +- WREG32_SOC15(UVD, 0, mmUVD_POWER_STATUS, reg_data); ++ tmp = RREG32_SOC15(UVD, 0, mmUVD_POWER_STATUS); ++ tmp |= UVD_POWER_STATUS__UVD_PG_MODE_MASK; ++ tmp |= UVD_POWER_STATUS__UVD_PG_EN_MASK; ++ WREG32_SOC15(UVD, 0, mmUVD_POWER_STATUS, tmp); + + /* enable clock gating */ + vcn_v1_0_clock_gating_dpg_mode(adev, 0); + + /* enable VCPU clock */ +- reg_data = (0xFF << UVD_VCPU_CNTL__PRB_TIMEOUT_VAL__SHIFT); +- reg_data |= UVD_VCPU_CNTL__CLK_EN_MASK; +- reg_data |= UVD_VCPU_CNTL__MIF_WR_LOW_THRESHOLD_BP_MASK; +- WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_VCPU_CNTL, reg_data, 0xFFFFFFFF, 0); ++ tmp = (0xFF << UVD_VCPU_CNTL__PRB_TIMEOUT_VAL__SHIFT); ++ tmp |= UVD_VCPU_CNTL__CLK_EN_MASK; ++ tmp |= UVD_VCPU_CNTL__MIF_WR_LOW_THRESHOLD_BP_MASK; ++ WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_VCPU_CNTL, tmp, 0xFFFFFFFF, 0); + + /* disable interupt */ + WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_MASTINT_EN, +-- +2.17.1 + |