From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: re-add locking around hw state readout Date: Mon, 24 Feb 2014 13:27:26 +0200 Message-ID: <20140224112726.GM3852@intel.com> References: <1393017219-2121-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C8EB2FA9D4 for ; Mon, 24 Feb 2014 03:27:41 -0800 (PST) Content-Disposition: inline In-Reply-To: <1393017219-2121-1-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Feb 21, 2014 at 01:13:39PM -0800, Jesse Barnes wrote: > To silence locking complaints. This was a rebase failure on my part in > = > commit fa9fa083d0606cb323f6105c17702460ea0a6780 > Author: Jesse Barnes > Date: Tue Feb 11 15:28:56 2014 -0800 > = > drm/i915: read out hw state earlier v2 > = > Reported-by: Ville Syrj=E4l=E4 > Signed-off-by: Jesse Barnes Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/intel_display.c | 2 ++ > 1 file changed, 2 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 13ad064..69cade7 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -11282,7 +11282,9 @@ void intel_modeset_init(struct drm_device *dev) > /* Just in case the BIOS is doing something questionable. */ > intel_disable_fbc(dev); > = > + mutex_lock(&dev->mode_config.mutex); > intel_modeset_setup_hw_state(dev, false); > + mutex_unlock(&dev->mode_config.mutex); > = > list_for_each_entry(crtc, &dev->mode_config.crtc_list, > base.head) { > -- = > 1.7.9.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC