[PATCH 89/89] drm/i915/skl: Disable contexts if execlists aren't enabled

Damien Lespiau
2014-09-04T11:29:25Z

We were hiting a BUG() in get_context_size() with execlist disabled.

"legacy" contexts are not supported on gen9 so we don't have a gen9
specific size to add in there. Instead, let's disable legacy contexts
altogether on gen9, whether we're booting with execlist enabled or not.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index a5221d8..ec81d8a 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -320,7 +320,7 @@ int i915_gem_context_init(struct drm_device *dev)
if (WARN_ON(dev_priv->ring[RCS].default_context))
return 0;

- if (i915.enable_execlists) {
+ if (INTEL_INFO(dev)->gen >= 9 || i915.enable_execlists) {
/* NB: intentionally left blank. We will allocate our own
* backing objects as we need them, thank you very much */
dev_priv->hw_context_size = 0;
--
1.8.3.1