[PATCH] drm/i915: disable contexts on old HW

[PATCH] drm/i915: disable contexts on old HW

[Ben Widawsky]

This got dropped as a result of the last round of comments. I didn't
test it on unsupported HW (which this is likely the case).

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_gem_context.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 6dc426a..8fb8cd8 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -243,8 +243,10 @@ void i915_gem_context_init(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	uint32_t ctx_size;
 
-	if (!HAS_HW_CONTEXTS(dev))
+	if (!HAS_HW_CONTEXTS(dev)) {
+		dev_priv->hw_contexts_disabled = true;
 		return;
+	}
 
 	/* If called from reset, or thaw... we've been here already */
 	if (dev_priv->hw_contexts_disabled ||
-- 
1.7.10.4

Re: [PATCH] drm/i915: disable contexts on old HW

[Daniel Vetter]

On Sun, Jun 17, 2012 at 09:37:24AM -0700, Ben Widawsky wrote:
> This got dropped as a result of the last round of comments. I didn't
> test it on unsupported HW (which this is likely the case).
> 
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Queued for -next, thanks for the patch. 
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_gem_context.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 6dc426a..8fb8cd8 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -243,8 +243,10 @@ void i915_gem_context_init(struct drm_device *dev)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	uint32_t ctx_size;
>  
> -	if (!HAS_HW_CONTEXTS(dev))
> +	if (!HAS_HW_CONTEXTS(dev)) {
> +		dev_priv->hw_contexts_disabled = true;
>  		return;
> +	}
>  
>  	/* If called from reset, or thaw... we've been here already */
>  	if (dev_priv->hw_contexts_disabled ||
> -- 
> 1.7.10.4
> 

-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48