[Intel-gfx] [PATCH] disable FBC for IGD

[Shaohua Li]

On Fri, Oct 09, 2009 at 11:53:16PM +0800, Jesse Barnes wrote:
> On Fri, 9 Oct 2009 14:06:40 +0800
> Shaohua Li <shaohua.li at intel.com> wrote:
> 
> > IGD doesn't support FBC. Enabling it will cause boot hang.
> > 
> > Signed-off-by: Shaohua Li <shaohua.li at intel.com>
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_dma.c
> > b/drivers/gpu/drm/i915/i915_dma.c index 45d507e..6c26bd6 100644
> > --- a/drivers/gpu/drm/i915/i915_dma.c
> > +++ b/drivers/gpu/drm/i915/i915_dma.c
> > @@ -1228,7 +1228,7 @@ static int i915_load_modeset_init(struct
> > drm_device *dev, 
> >  	/* Try to set up FBC with a reasonable compressed buffer
> > size */ if (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_I965G(dev) ||
> > IS_GM45(dev)) &&
> > -	    i915_powersave) {
> > +	    !IS_IGD(dev) && i915_powersave) {
> >  		int cfb_size;
> 
> Can you update this part to use I915_HAS_FBC instead while you're at it?
ok.


IGD doesn't support FBC. Enabling it will cause boot hang.

Signed-off-by: Shaohua Li <shaohua.li at intel.com>

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 45d507e..4af7c7c 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1227,8 +1227,7 @@ static int i915_load_modeset_init(struct drm_device *dev,
 		goto out;
 
 	/* Try to set up FBC with a reasonable compressed buffer size */
-	if (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_I965G(dev) || IS_GM45(dev)) &&
-	    i915_powersave) {
+	if (I915_HAS_FBC(dev) && i915_powersave) {
 		int cfb_size;
 
 		/* Try to get an 8M buffer... */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b24b2d1..ab1f3cb 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -979,7 +979,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 
 #define HAS_FW_BLC(dev) (IS_I9XX(dev) || IS_G4X(dev) || IS_IGDNG(dev))
 #define HAS_PIPE_CXSR(dev) (IS_G4X(dev) || IS_IGDNG(dev))
-#define I915_HAS_FBC(dev) (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_I965G(dev)))
+#define I915_HAS_FBC(dev) (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_GM45(dev)) && !IS_IGD(dev))
 
 #define PRIMARY_RINGBUFFER_SIZE         (128*1024)