From: Stuart Summers <stuart.summers@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/2] drm/i915: WARN rather than BUG with unexpected media engines
Date: Tue, 27 Aug 2019 16:14:34 -0700 [thread overview]
Message-ID: <20190827231435.398-2-stuart.summers@intel.com> (raw)
In-Reply-To: <20190827231435.398-1-stuart.summers@intel.com>
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@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-08-27 23:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 23:14 [PATCH 0/2] Add module parameter to reduce engine instances Stuart Summers
2019-08-27 23:14 ` Stuart Summers [this message]
2019-08-27 23:14 ` [PATCH 2/2] drm/i915: Add ring_mask module parameter Stuart Summers
2019-08-28 9:34 ` Chris Wilson
2019-08-28 15:13 ` Summers, Stuart
2019-08-27 23:21 ` ✗ Fi.CI.CHECKPATCH: warning for Add module parameter to reduce engine instances Patchwork
2019-08-28 9:28 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-29 10:16 ` ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190827231435.398-2-stuart.summers@intel.com \
--to=stuart.summers@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox