drm/xe: Add xe_ggtt_might_lock

Another requirement of hiding more of struct xe_ggtt.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250505121924.921544-3-dev@lankhorst.se
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index f35a7786a56fb506fa8d76de54154d09c779d92a..4e39188a021ab058fd6625cc11b44ffd1c8eb6a9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -3076,7 +3076,7 @@ void xe_bo_put(struct xe_bo *bo)
 #endif
                for_each_tile(tile, xe_bo_device(bo), id)
                        if (bo->ggtt_node[id] && bo->ggtt_node[id]->ggtt)
-                               might_lock(&bo->ggtt_node[id]->ggtt->lock);
+                               xe_ggtt_might_lock(bo->ggtt_node[id]->ggtt);
                drm_gem_object_put(&bo->ttm.base);
        }
 }

diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
index b4bd5e7b27545a54fb3ea190e8682ff970bfdb2b..bf69737ed5ea88768c568b4c020edb35c4fde027 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -176,6 +176,13 @@ static void ggtt_fini(void *arg)
        ggtt->scratch = NULL;
 }
 
+#ifdef CONFIG_LOCKDEP
+void xe_ggtt_might_lock(struct xe_ggtt *ggtt)
+{
+       might_lock(&ggtt->lock);
+}
+#endif
+
 static void primelockdep(struct xe_ggtt *ggtt)
 {
        if (!IS_ENABLED(CONFIG_LOCKDEP))

diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h
index d7dc3abda02cd50f6f6527674608d8e49375e0cf..58ba68d32f2e2d39040c4a0a8201b0d7583b93cc 100644 (file)
--- a/drivers/gpu/drm/xe/xe_ggtt.h
+++ b/drivers/gpu/drm/xe/xe_ggtt.h
@@ -39,4 +39,11 @@ u64 xe_ggtt_print_holes(struct xe_ggtt *ggtt, u64 alignment, struct drm_printer
 void xe_ggtt_assign(const struct xe_ggtt_node *node, u16 vfid);
 #endif
 
+#ifndef CONFIG_LOCKDEP
+static inline void xe_ggtt_might_lock(struct xe_ggtt *ggtt)
+{ }
+#else
+void xe_ggtt_might_lock(struct xe_ggtt *ggtt);
+#endif
+
 #endif