On Thu, 11 Oct 2012 11:49:36 -0700, Jesse Barnes <jbarnes at virtuousgeek.org> wrote: > On Tue, 4 Sep 2012 21:03:04 +0100 > Chris Wilson <chris at chris-wilson.co.uk> 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
