From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 12/24] drm/i915: Delay allocation of stolen space for FBC Date: Thu, 11 Oct 2012 19:56:38 +0100 Message-ID: <84c8a8$63065b@orsmga001.jf.intel.com> References: <1346788996-19080-1-git-send-email-chris@chris-wilson.co.uk> <1346788996-19080-13-git-send-email-chris@chris-wilson.co.uk> <20121011114936.20de2c39@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id ABA97A0895 for ; Thu, 11 Oct 2012 11:56:49 -0700 (PDT) In-Reply-To: <20121011114936.20de2c39@jbarnes-desktop> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, 11 Oct 2012 11:49:36 -0700, Jesse Barnes wrote: > On Tue, 4 Sep 2012 21:03:04 +0100 > Chris Wilson wrote: > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 778cbb8..221d035 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -7231,6 +7231,9 @@ void intel_modeset_init(struct drm_device *dev) > > /* Just disable it once at startup */ > > i915_disable_vga(dev); > > intel_setup_outputs(dev); > > + > > + /* Just in case the BIOS is doing something questionable. */ > > + intel_disable_fbc(dev); > > } > > > > void intel_modeset_gem_init(struct drm_device *dev) > > Assuming you actually call this function in a later patch: Yikes, you are right. This was one patch but Daniel complained that the double tweaking was non-obvious, so I tried to split the reordering of intel_enable_fbc() and the delayed allocation of cfb. I failed to keep the code working in between these two patches. :( -Chris -- Chris Wilson, Intel Open Source Technology Centre