diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:15 -0500 |
| commit | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch) | |
| tree | dde815788aaea3e336aaaf24763311ce63a22e1b /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 75639e7ee1401b3876c7a00ffe96ea8027668690 (diff) | |
| parent | d6797322231af98b9bb4afb175dd614cf511e5f7 (diff) | |
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 92aeb918e0c0..e5b138be45fa 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, | |||
| 1227 | goto out; | 1227 | goto out; |
| 1228 | 1228 | ||
| 1229 | /* Try to set up FBC with a reasonable compressed buffer size */ | 1229 | /* Try to set up FBC with a reasonable compressed buffer size */ |
| 1230 | if (IS_MOBILE(dev) && (IS_I9XX(dev) || IS_I965G(dev) || IS_GM45(dev)) && | 1230 | if (I915_HAS_FBC(dev) && i915_powersave) { |
| 1231 | i915_powersave) { | ||
| 1232 | int cfb_size; | 1231 | int cfb_size; |
| 1233 | 1232 | ||
| 1234 | /* Try to get an 8M buffer... */ | 1233 | /* Try to get an 8M buffer... */ |