From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/6] drm/i915: read out hw state earlier v2 Date: Wed, 12 Feb 2014 10:13:03 +0100 Message-ID: <20140212091303.GR17001@phenom.ffwll.local> References: <1392161341-6881-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by gabe.freedesktop.org (Postfix) with ESMTP id C31C5FAD36 for ; Wed, 12 Feb 2014 01:13:08 -0800 (PST) Received: by mail-lb0-f178.google.com with SMTP id u14so6963404lbd.9 for ; Wed, 12 Feb 2014 01:13:07 -0800 (PST) Content-Disposition: inline In-Reply-To: <1392161341-6881-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 Tue, Feb 11, 2014 at 03:28:56PM -0800, Jesse Barnes wrote: > We want to do this early on before we try to fetch the plane config, > which depends on some of the pipe config state. I think the crucial step here is actually the gem setup, more specifically the stolen setup. If we don't do the fb reconstruction before that we can't pre-reserve the space any more. I'll amend the commit message. -Daniel > > v2: split back out from get_plane_config change (Daniel) > update for recent locking & reset changes (Jesse) > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_display.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 0df974b..cecb2c9 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -11072,6 +11072,8 @@ void intel_modeset_init(struct drm_device *dev) > > /* Just in case the BIOS is doing something questionable. */ > intel_disable_fbc(dev); > + > + intel_modeset_setup_hw_state(dev, false); > } > > static void > @@ -11439,10 +11441,6 @@ void intel_modeset_gem_init(struct drm_device *dev) > intel_modeset_init_hw(dev); > > intel_setup_overlay(dev); > - > - mutex_lock(&dev->mode_config.mutex); > - intel_modeset_setup_hw_state(dev, false); > - mutex_unlock(&dev->mode_config.mutex); > } > > void intel_modeset_cleanup(struct drm_device *dev) > -- > 1.7.9.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