diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2009-10-10 03:20:55 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-10-13 13:09:26 -0400 |
| commit | 9216d44dc13b5e858253f06d83ceea25a9b72f4f (patch) | |
| tree | 1aa7d1e45f81dd6b9848cf56d4121fc221fc166a /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 161291396e76e0832c08f617eb9bd364d1648148 (diff) | |
drm/i915: disable FBC for Pineview, fixing a boot hang.
Pineview doesn't have this FBC mechanism, so this code doesn't apply.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
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... */ |