From: Alex Deucher <alexander.deucher@xxxxxxx>
commit f756dbac1ce1d5f9a2b35e3b55fa429cf6336437 upstream.
Need to read back to make sure the write goes through.
Cc: David Belanger <david.belanger@xxxxxxx>
Reviewed-by: Frank Min <frank.min@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c
@@ -31,13 +31,15 @@
static void hdp_v5_2_flush_hdp(struct amdgpu_device *adev,
struct amdgpu_ring *ring)
{
- if (!ring || !ring->funcs->emit_wreg)
+ if (!ring || !ring->funcs->emit_wreg) {
WREG32_NO_KIQ((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2,
0);
- else
+ RREG32_NO_KIQ((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);
+ } else {
amdgpu_ring_emit_wreg(ring,
(adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2,
0);
+ }
}
static void hdp_v5_2_update_mem_power_gating(struct amdgpu_device *adev,
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.1/drm-amd-display-check-null-initialized-variables.patch
queue-6.1/drm-amd-pm-update-current_socclk-and-current_uclk-in-gpu_metrics-on-smu-v13.0.7.patch
queue-6.1/drm-amd-display-check-phantom_stream-before-it-is-used.patch
queue-6.1/drm-amdgpu-hdp5.2-do-a-posting-read-when-flushing-hdp.patch
queue-6.1/drm-amd-display-add-null-check-for-clk_mgr-in-dcn32_init_hw.patch
queue-6.1/drm-amd-display-initialize-denominators-default-to-1.patch
queue-6.1/drm-amd-display-add-null-check-for-clk_mgr-and-clk_mgr-funcs-in-dcn30_init_hw.patch
queue-6.1/drm-amd-display-add-null-check-for-function-pointer-.patch
queue-6.1/drm-amd-display-add-null-check-for-function-pointer-in-dcn20_set_output_transfer_func.patch
queue-6.1/drm-amdkfd-fix-wrong-usage-of-init_work.patch
