Merge tag 'drm-intel-gt-next-2024-02-15' of git://anongit.freedesktop.org/drm/drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a72cecd2dbc74dbf252a93a91bec3a73d217e93f..e81b3b2858acccd3146fb9de2b93a897c511bf96 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -163,7 +163,7 @@ struct i915_gem_mm {
 
        struct notifier_block oom_notifier;
        struct notifier_block vmap_notifier;
-       struct shrinker shrinker;
+       struct shrinker *shrinker;
 
        /* shrinker accounting, also useful for userland debugging */
        u64 shrink_memory;
@@ -388,20 +388,6 @@ static inline struct intel_gt *to_gt(const struct drm_i915_private *i915)
        return i915->gt[0];
 }
 
-/* Simple iterator over all initialised engines */
-#define for_each_engine(engine__, gt__, id__) \
-       for ((id__) = 0; \
-            (id__) < I915_NUM_ENGINES; \
-            (id__)++) \
-               for_each_if ((engine__) = (gt__)->engine[(id__)])
-
-/* Iterator over subset of engines selected by mask */
-#define for_each_engine_masked(engine__, gt__, mask__, tmp__) \
-       for ((tmp__) = (mask__) & (gt__)->info.engine_mask; \
-            (tmp__) ? \
-            ((engine__) = (gt__)->engine[__mask_next_bit(tmp__)]), 1 : \
-            0;)
-
 #define rb_to_uabi_engine(rb) \
        rb_entry_safe(rb, struct intel_engine_cs, uabi_node)
 
@@ -410,11 +396,6 @@ static inline struct intel_gt *to_gt(const struct drm_i915_private *i915)
             (engine__); \
             (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
 
-#define for_each_uabi_class_engine(engine__, class__, i915__) \
-       for ((engine__) = intel_engine_lookup_user((i915__), (class__), 0); \
-            (engine__) && (engine__)->uabi_class == (class__); \
-            (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
-
 #define INTEL_INFO(i915)       ((i915)->__info)
 #define RUNTIME_INFO(i915)     (&(i915)->__runtime)
 #define DRIVER_CAPS(i915)      (&(i915)->caps)
@@ -567,6 +548,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define IS_DG2(i915)   IS_PLATFORM(i915, INTEL_DG2)
 #define IS_PONTEVECCHIO(i915) IS_PLATFORM(i915, INTEL_PONTEVECCHIO)
 #define IS_METEORLAKE(i915) IS_PLATFORM(i915, INTEL_METEORLAKE)
+#define IS_LUNARLAKE(i915) 0
 
 #define IS_DG2_G10(i915) \
        IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G10)