| From 8d1ab59df9e8a19abc331c73180269222c8cf96c Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Fri, 14 Jun 2013 15:23:24 +0100 |
| Subject: drm/i915: We implement WaFbcAsynchFlipDisableFbcQueue on ilk and snb |
| |
| v2: Put the comment a bit closer to the actual write (Paulo Zanoni) |
| |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> |
| [danvet: Fix space before tab.] |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| |
| (cherry picked from commit 4bb353343dcc2486a1deda87f4c069153dc353c3) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index abd216d6cde3..cc5883215df4 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -4453,6 +4453,7 @@ static void ironlake_init_clock_gating(struct drm_device *dev) |
| * The bit 7,8,9 of 0x42020. |
| */ |
| if (IS_IRONLAKE_M(dev)) { |
| + /* WaFbcAsynchFlipDisableFbcQueue:ilk */ |
| I915_WRITE(ILK_DISPLAY_CHICKEN1, |
| I915_READ(ILK_DISPLAY_CHICKEN1) | |
| ILK_FBCQ_DIS); |
| @@ -4589,6 +4590,8 @@ static void gen6_init_clock_gating(struct drm_device *dev) |
| * The bit5 and bit7 of 0x42020 |
| * The bit14 of 0x70180 |
| * The bit14 of 0x71180 |
| + * |
| + * WaFbcAsynchFlipDisableFbcQueue:snb |
| */ |
| I915_WRITE(ILK_DISPLAY_CHICKEN1, |
| I915_READ(ILK_DISPLAY_CHICKEN1) | |
| -- |
| 1.8.5.rc3 |
| |