diff mbox

Request for testing

Message ID 20090918083551.363af17e@jbarnes-g45 (mailing list archive)
State Not Applicable
Headers show

Commit Message

Jesse Barnes Sept. 18, 2009, 3:35 p.m. UTC 
On Fri, 18 Sep 2009 08:29:22 -0700
Jesse Barnes <jbarnes@virtuousgeek.org> wrote:

> On Fri, 18 Sep 2009 11:15:50 +0200
> Alexey Fisher <bug-track@fisher-privat.net> wrote:
> 
> > Jesse Barnes schrieb:
> > > Eric asked me to track drm-intel patches while he was out this
> > > week, so I just dumped a bunch in the drm-intel-next branch of my
> > > drm-intel tree at kernel.org
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel.git
> > > 
> > > It includes several patchset that have been baking awhile:
> > >   - reset support for 965 (from Ben and myself)
> > >   - memory shrinker/madvise support (from Chris)
> > >   - Ironlake fixes (from Zhenyu)
> > >   - misc bug fixes (mostly me fixing my own bugs)
> > > 
> > > So please pull it down and hammer on it.  Hopefully the merge
> > > window will still be open next week so we can get this set into
> > > 2.6.32.
> > > 
> > > Thanks,
> > 
> > 
> > With this kommit my PC (Intel DG45ID) freez on boot. I can't get
> > any error messages.
> > Reverting it make the system work.
> > 
> > commit 8082400327d8d2ca54254b593644942bed0edd25
> > Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> > Date:   Thu Sep 10 15:28:06 2009 -0700
> > 
> >      drm/i915: framebuffer compression for pre-GM45
> > 
> >      This patch adds framebuffer compression (good for about ~0.5W
> > power savings in the best case) support for pre-GM45 chips.  GM45+
> > have a new,
> >      more flexible FBC scheme that will be added in a separate
> > patch.
> > 
> >      FBC can't always be enabled: the compressed buffer must be
> > physically contiguous and reside in stolen space.  So if you have a
> > large display and a small amount of stolen memory, you may not be
> > able to take advantage of FBC.  In some cases, a BIOS setting
> > controls how much stolen space is available.  Increasing this to 8
> > or 16M can help.
> > 
> >      Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> >      Signed-off-by: Eric Anholt <eric@anholt.net>
> 
> Hm, I thought I fixed that hang with
> 
> commit c1a1cdc159e211f045290f61ac95092e9708f5bc
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date:   Wed Sep 16 15:05:00 2009 -0700
> 
>     drm/i915: fix startup hang on some non-mobile platforms
> 
> Can you confirm you had that in your tree?

If so, this might help:
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index cb0f4f9..b8c2a4f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1064,6 +1064,9 @@  static void intel_update_fbc(struct drm_crtc *crtc,
 	if (!i915_powersave)
 		return;
 
+	if (!I915_HAS_FBC(dev))
+		return;
+
 	if (!crtc->fb)
 		return;