From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/4] drm/i915: Restore the display config after a GPU reset on gen4 Date: Tue, 20 May 2014 10:03:44 +0200 Message-ID: <20140520080344.GD8790@phenom.ffwll.local> References: <1400527521-3454-1-git-send-email-ville.syrjala@linux.intel.com> <1400527521-3454-3-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f51.google.com (mail-ee0-f51.google.com [74.125.83.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BD096E100 for ; Tue, 20 May 2014 01:03:49 -0700 (PDT) Received: by mail-ee0-f51.google.com with SMTP id e51so252705eek.38 for ; Tue, 20 May 2014 01:03:48 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1400527521-3454-3-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, May 19, 2014 at 10:25:19PM +0300, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > On pre-ctg GPU reset also resets the display hardware. Force a mode > restore after the GPU reset, and also re-init clock gating. > = > Signed-off-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/i915_drv.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_= drv.c > index b948c71..2ec3796 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -794,6 +794,14 @@ int i915_reset(struct drm_device *dev) > if (INTEL_INFO(dev)->gen > 5) > intel_reset_gt_powersave(dev); > = > + if (IS_GEN4(dev) && !IS_G4X(dev)) { > + intel_init_clock_gating(dev); > + > + drm_modeset_lock_all(dev); > + intel_modeset_setup_hw_state(dev, true); > + drm_modeset_unlock_all(dev); Locking inversion here. I think we need to push this down to the very end. Also this leaves the interesting question of what happens with vblank waits and friends ... -Daniel > + } > + > intel_hpd_init(dev); > } else { > mutex_unlock(&dev->struct_mutex); > -- = > 1.8.5.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch