]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amdgpu/hdp5: use memcfg register to post the write for HDP flush
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 30 Apr 2025 16:46:56 +0000 (12:46 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 8 May 2025 15:46:57 +0000 (11:46 -0400)
Reading back the remapped HDP flush register seems to cause
problems on some platforms. All we need is a read, so read back
the memcfg register.

Fixes: cf424020e040 ("drm/amdgpu/hdp5.0: do a posting read when flushing HDP")
Reported-by: Alexey Klimov <alexey.klimov@linaro.org>
Link: https://lists.freedesktop.org/archives/amd-gfx/2025-April/123150.html
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4119
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3908
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit a5cb344033c7598762e89255e8ff52827abb57a4)
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c

index 43195c07974808f24d0696a7c9a5d4405770d34b..086a647308df07ac027d34c3dbf496357d98386f 100644 (file)
@@ -32,7 +32,12 @@ static void hdp_v5_0_flush_hdp(struct amdgpu_device *adev,
 {
        if (!ring || !ring->funcs->emit_wreg) {
                WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
-               RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);
+               /* We just need to read back a register to post the write.
+                * Reading back the remapped register causes problems on
+                * some platforms so just read back the memory size register.
+                */
+               if (adev->nbio.funcs->get_memsize)
+                       adev->nbio.funcs->get_memsize(adev);
        } else {
                amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
        }