drm/i915: Make IS_GEN-range macro only take dev_priv

Saves 944 bytes of .rodata strings.

v2: Add parantheses around dev_priv. (Ville Syrjala)

Signed-off-by: Tvrtko Ursulin <[email protected]>
Reviewed-by: David Weinehall <[email protected]>
Acked-by: Daniel Vetter <[email protected]>
Acked-by: Jani Nikula <[email protected]>
Acked-by: Chris Wilson <[email protected]>
Acked-by: Maarten Lankhorst <[email protected]>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2cad4d74109c419ddc9f3cf1aae0de5fdb3c8c97..100740e50e701e478761b899079bec6d5cea02c7 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2612,7 +2612,7 @@ struct drm_i915_cmd_table {
  *
  * Use GEN_FOREVER for unbound start and or end.
  */
-#define IS_GEN(p, s, e) ({ \
+#define IS_GEN(dev_priv, s, e) ({ \
        unsigned int __s = (s), __e = (e); \
        BUILD_BUG_ON(!__builtin_constant_p(s)); \
        BUILD_BUG_ON(!__builtin_constant_p(e)); \
@@ -2622,7 +2622,7 @@ struct drm_i915_cmd_table {
                __e = BITS_PER_LONG - 1; \
        else \
                __e = (e) - 1; \
-       !!(INTEL_INFO(p)->gen_mask & GENMASK((__e), (__s))); \
+       !!((dev_priv)->info.gen_mask & GENMASK((__e), (__s))); \
 })
 
 /*