From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH] drm/i915: disable contexts on old HW
Date: Mon, 18 Jun 2012 10:13:22 +0200
Message-ID: <20120618081322.GA4773@phenom.ffwll.local>
References: <1339951044-6287-1-git-send-email-ben@bwidawsk.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com
	[209.85.214.49])
	by gabe.freedesktop.org (Postfix) with ESMTP id 43AA19E74E
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 18 Jun 2012 01:13:45 -0700 (PDT)
Received: by bkwj4 with SMTP id j4so4297454bkw.36
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 18 Jun 2012 01:13:44 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1339951044-6287-1-git-send-email-ben@bwidawsk.net>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Ben Widawsky <ben@bwidawsk.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel GFX <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

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