drm/i915: Do not use INTEL_INFO(dev_priv)->ring_mask inside WARNs

Saves 1520 bytes of .rodata strings.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Jani Nikula <jani.nikula@linux.intel.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index fba6edd9f8199780f43ff5cbc548b4237985156e..2dc94812bea5840c8ddffa1ce639ee944966b670 100644 (file)
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -116,6 +116,7 @@ int intel_engines_init(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct intel_device_info *device_info = mkwrite_device_info(dev_priv);
+       unsigned int ring_mask = INTEL_INFO(dev_priv)->ring_mask;
        unsigned int mask = 0;
        int (*init)(struct intel_engine_cs *engine);
        struct intel_engine_cs *engine;
@@ -123,8 +124,8 @@ int intel_engines_init(struct drm_device *dev)
        unsigned int i;
        int ret;
 
-       WARN_ON(INTEL_INFO(dev_priv)->ring_mask == 0);
-       WARN_ON(INTEL_INFO(dev_priv)->ring_mask &
+       WARN_ON(ring_mask == 0);
+       WARN_ON(ring_mask &
                GENMASK(sizeof(mask) * BITS_PER_BYTE - 1, I915_NUM_ENGINES));
 
        for (i = 0; i < ARRAY_SIZE(intel_engines); i++) {
@@ -155,7 +156,7 @@ int intel_engines_init(struct drm_device *dev)
         * are added to the driver by a warning and disabling the forgotten
         * engines.
         */
-       if (WARN_ON(mask != INTEL_INFO(dev_priv)->ring_mask))
+       if (WARN_ON(mask != ring_mask))
                device_info->ring_mask = mask;
 
        device_info->num_rings = hweight32(mask);