From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH] drm/i915: re-init modeset hw state after
	gpu reset
Date: Tue, 10 Apr 2012 15:10:23 +0100
Message-ID: <1334067022_346667@CP5-2952>
References: <1334065584-10392-1-git-send-email-daniel.vetter@ffwll.ch>
	<1334065811-13697-1-git-send-email-daniel.vetter@ffwll.ch>
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 fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236])
	by gabe.freedesktop.org (Postfix) with ESMTP id 9AED19E754
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 10 Apr 2012 07:10:35 -0700 (PDT)
In-Reply-To: <1334065811-13697-1-git-send-email-daniel.vetter@ffwll.ch>
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: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

On Tue, 10 Apr 2012 15:50:11 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> After a gpu reset we need to re-init some of the hw state we only
> initialize when modeset is enabled, like rc6, hw contexts or render/GT
> core clock gating and workaround register settings.
> 
> Note that this patch has a small change in the resume code:
> - rc6 on gen6+ is only restored for the modeset case (for more
>   consistency with other callsites). This is no problem because recent
>   kernels refuse to load drm/i915 without kms on gen6+
> - rc6/emon on ilk is only restored for the modeset case. This is no
>   problem because rc6 is disabled by default on ilk, and ums on ilk
>   has never really been a supported option outside of horrible rhel
>   backports.
> 
> v2: Chris Wilson noticed that we not only fail to restore the clock
> gating settings after gpu reset.
> 
> v3: Move the call to modeset_init_hw in _reset out of the
> struct_mutext protected area - other callers don't hold it, too.
> 
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

I don't think it makes the locking any worse than it already is, but it
is becoming more and more suspect.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre