drm/v3d: Reach the GMP through the hub registers on V3D 7.x

v3d_idle_axi() drains the GPU's memory interface for a safe powerdown by
using the V3D_GMP_CFG register. It reached both registers with the macros
V3D_CORE_READ and V3D_CORE_WRITE.

On V3D 7.x the GMP is no longer a per-core block; it lives in the hub
register region. Reaching it through the per-core register block addresses
the wrong region.

Select the hub accessors (V3D_{READ,WRITE}) for the GMP on V3D 7.x and
keep the per-core path for earlier generations.

Cc: stable@vger.kernel.org
Fixes: 0ad5bc1ce463 ("drm/v3d: fix up register addresses for V3D 7.x")
Link: https://patch.msgid.link/20260718-v3d-pm-axi-transactions-v1-1-4ecd7729ed70@igalia.com
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Maíra Canal <mcanal@igalia.com>

diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
index c43d9af41374b7ac8d7842e14645067e3c9f652d..bb0eec870794ca1a426142cef0d70805fd1d234d 100644 (file)
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -39,6 +39,18 @@ v3d_init_core(struct v3d_dev *v3d, int core)
 static void
 v3d_idle_axi(struct v3d_dev *v3d, int core)
 {
+       if (v3d->ver >= V3D_GEN_71) {
+               V3D_WRITE(V3D_GMP_CFG(v3d->ver), V3D_GMP_CFG_STOP_REQ);
+
+               if (wait_for((V3D_READ(V3D_GMP_STATUS(v3d->ver)) &
+                             (V3D_GMP_STATUS_RD_COUNT_MASK |
+                              V3D_GMP_STATUS_WR_COUNT_MASK |
+                              V3D_GMP_STATUS_CFG_BUSY)) == 0, 100)) {
+                       drm_err(&v3d->drm, "Failed to wait for safe GMP shutdown\n");
+               }
+               return;
+       }
+
        V3D_CORE_WRITE(core, V3D_GMP_CFG(v3d->ver), V3D_GMP_CFG_STOP_REQ);
 
        if (wait_for((V3D_CORE_READ(core, V3D_GMP_STATUS(v3d->ver)) &