[Intel-gfx] [PATCH 1/2] drm/i915: WARN rather than BUG with unexpected media engines

Stuart Summers stuart.summers at intel.com
Tue Aug 27 23:14:34 UTC 2019


Instead of preventing driver load when media engines enabled
for a platform do not match the fuse values for those media
engines, WARN_ON to indicate the observation but continue
with driver load.

Signed-off-by: Stuart Summers <stuart.summers at intel.com>
---
 drivers/gpu/drm/i915/intel_device_info.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index d9b5baaef5d0..caef01b1da23 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -1023,7 +1023,7 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)
 	}
 	DRM_DEBUG_DRIVER("vdbox enable: %04x, instances: %04lx\n",
 			 vdbox_mask, VDBOX_MASK(dev_priv));
-	GEM_BUG_ON(vdbox_mask != VDBOX_MASK(dev_priv));
+	GEM_WARN_ON(vdbox_mask != VDBOX_MASK(dev_priv));
 
 	for (i = 0; i < I915_MAX_VECS; i++) {
 		if (!HAS_ENGINE(dev_priv, _VECS(i)))
@@ -1036,5 +1036,5 @@ void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)
 	}
 	DRM_DEBUG_DRIVER("vebox enable: %04x, instances: %04lx\n",
 			 vebox_mask, VEBOX_MASK(dev_priv));
-	GEM_BUG_ON(vebox_mask != VEBOX_MASK(dev_priv));
+	GEM_WARN_ON(vebox_mask != VEBOX_MASK(dev_priv));
 }
-- 
2.22.0



More information about the Intel-gfx mailing list