diff options
| author | Keith Packard <keithp@keithp.com> | 2011-09-28 14:44:38 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-09-28 14:44:38 -0700 |
| commit | 0ac225e56997ef89f46eb51b02799a685b78f214 (patch) | |
| tree | 9a7694b8748c08b5c74ab07b4df6d53defd8216f /drivers/gpu/drm/i915/intel_display.c | |
| parent | 64a742fac3a22f57303d8f1b7e347350a1c48254 (diff) | |
| parent | cd0de039bff32ee314046c0e4c047c38aa696f84 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f0e5f9f32aa8..8230cf54cc8d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1800,6 +1800,7 @@ static void intel_update_fbc(struct drm_device *dev) struct drm_framebuffer *fb; struct intel_framebuffer *intel_fb; struct drm_i915_gem_object *obj; + int enable_fbc; DRM_DEBUG_KMS("\n"); @@ -1840,8 +1841,15 @@ static void intel_update_fbc(struct drm_device *dev) intel_fb = to_intel_framebuffer(fb); obj = intel_fb->obj; - if (!i915_enable_fbc) { - DRM_DEBUG_KMS("fbc disabled per module param (default off)\n"); + enable_fbc = i915_enable_fbc; + if (enable_fbc < 0) { + DRM_DEBUG_KMS("fbc set to per-chip default\n"); + enable_fbc = 1; + if (INTEL_INFO(dev)->gen <= 5) + enable_fbc = 0; + } + if (!enable_fbc) { + DRM_DEBUG_KMS("fbc disabled per module param\n"); dev_priv->no_fbc_reason = FBC_MODULE_PARAM; goto out_disable; } |