Commit 70006ad6 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

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

Saves 1520 bytes of .rodata strings.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 6772ffe0
...@@ -116,6 +116,7 @@ int intel_engines_init(struct drm_device *dev) ...@@ -116,6 +116,7 @@ int intel_engines_init(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_device_info *device_info = mkwrite_device_info(dev_priv); 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; unsigned int mask = 0;
int (*init)(struct intel_engine_cs *engine); int (*init)(struct intel_engine_cs *engine);
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
...@@ -123,8 +124,8 @@ int intel_engines_init(struct drm_device *dev) ...@@ -123,8 +124,8 @@ int intel_engines_init(struct drm_device *dev)
unsigned int i; unsigned int i;
int ret; int ret;
WARN_ON(INTEL_INFO(dev_priv)->ring_mask == 0); WARN_ON(ring_mask == 0);
WARN_ON(INTEL_INFO(dev_priv)->ring_mask & WARN_ON(ring_mask &
GENMASK(sizeof(mask) * BITS_PER_BYTE - 1, I915_NUM_ENGINES)); GENMASK(sizeof(mask) * BITS_PER_BYTE - 1, I915_NUM_ENGINES));
for (i = 0; i < ARRAY_SIZE(intel_engines); i++) { for (i = 0; i < ARRAY_SIZE(intel_engines); i++) {
...@@ -155,7 +156,7 @@ int intel_engines_init(struct drm_device *dev) ...@@ -155,7 +156,7 @@ int intel_engines_init(struct drm_device *dev)
* are added to the driver by a warning and disabling the forgotten * are added to the driver by a warning and disabling the forgotten
* engines. * engines.
*/ */
if (WARN_ON(mask != INTEL_INFO(dev_priv)->ring_mask)) if (WARN_ON(mask != ring_mask))
device_info->ring_mask = mask; device_info->ring_mask = mask;
device_info->num_rings = hweight32(mask); device_info->num_rings = hweight32(mask);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment