diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2013-05-10 09:33:17 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-05-10 15:56:52 -0400 |
| commit | 7dd23ba0899bd1a203cc1d6e7878d7dfc910a511 (patch) | |
| tree | 7f7bfa955ad397091fe905f826efebeed96e7968 | |
| parent | 7881d4f11c00f506907b1bccb73df81509dc9c15 (diff) | |
drm/i915: Add missing platform tags to FBC workaround comments
There was a race between Rodrigo writing those patches and me
formalizing the addition of platform tags. This patches fixes it.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index d806448f84fa..28cec57e3f8c 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
| @@ -243,13 +243,13 @@ static void ironlake_disable_fbc(struct drm_device *dev) | |||
| 243 | I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl); | 243 | I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl); |
| 244 | 244 | ||
| 245 | if (IS_IVYBRIDGE(dev)) | 245 | if (IS_IVYBRIDGE(dev)) |
| 246 | /* WaFbcDisableDpfcClockGating */ | 246 | /* WaFbcDisableDpfcClockGating:ivb */ |
| 247 | I915_WRITE(ILK_DSPCLK_GATE_D, | 247 | I915_WRITE(ILK_DSPCLK_GATE_D, |
| 248 | I915_READ(ILK_DSPCLK_GATE_D) & | 248 | I915_READ(ILK_DSPCLK_GATE_D) & |
| 249 | ~ILK_DPFCUNIT_CLOCK_GATE_DISABLE); | 249 | ~ILK_DPFCUNIT_CLOCK_GATE_DISABLE); |
| 250 | 250 | ||
| 251 | if (IS_HASWELL(dev)) | 251 | if (IS_HASWELL(dev)) |
| 252 | /* WaFbcDisableDpfcClockGating */ | 252 | /* WaFbcDisableDpfcClockGating:hsw */ |
| 253 | I915_WRITE(HSW_CLKGATE_DISABLE_PART_1, | 253 | I915_WRITE(HSW_CLKGATE_DISABLE_PART_1, |
| 254 | I915_READ(HSW_CLKGATE_DISABLE_PART_1) & | 254 | I915_READ(HSW_CLKGATE_DISABLE_PART_1) & |
| 255 | ~HSW_DPFC_GATING_DISABLE); | 255 | ~HSW_DPFC_GATING_DISABLE); |
| @@ -281,17 +281,17 @@ static void gen7_enable_fbc(struct drm_crtc *crtc, unsigned long interval) | |||
| 281 | intel_crtc->plane << IVB_DPFC_CTL_PLANE_SHIFT); | 281 | intel_crtc->plane << IVB_DPFC_CTL_PLANE_SHIFT); |
| 282 | 282 | ||
| 283 | if (IS_IVYBRIDGE(dev)) { | 283 | if (IS_IVYBRIDGE(dev)) { |
| 284 | /* WaFbcAsynchFlipDisableFbcQueue */ | 284 | /* WaFbcAsynchFlipDisableFbcQueue:ivb */ |
| 285 | I915_WRITE(ILK_DISPLAY_CHICKEN1, ILK_FBCQ_DIS); | 285 | I915_WRITE(ILK_DISPLAY_CHICKEN1, ILK_FBCQ_DIS); |
| 286 | /* WaFbcDisableDpfcClockGating */ | 286 | /* WaFbcDisableDpfcClockGating:ivb */ |
| 287 | I915_WRITE(ILK_DSPCLK_GATE_D, | 287 | I915_WRITE(ILK_DSPCLK_GATE_D, |
| 288 | I915_READ(ILK_DSPCLK_GATE_D) | | 288 | I915_READ(ILK_DSPCLK_GATE_D) | |
| 289 | ILK_DPFCUNIT_CLOCK_GATE_DISABLE); | 289 | ILK_DPFCUNIT_CLOCK_GATE_DISABLE); |
| 290 | } else { | 290 | } else { |
| 291 | /* WaFbcAsynchFlipDisableFbcQueue */ | 291 | /* WaFbcAsynchFlipDisableFbcQueue:hsw */ |
| 292 | I915_WRITE(HSW_PIPE_SLICE_CHICKEN_1(intel_crtc->pipe), | 292 | I915_WRITE(HSW_PIPE_SLICE_CHICKEN_1(intel_crtc->pipe), |
| 293 | HSW_BYPASS_FBC_QUEUE); | 293 | HSW_BYPASS_FBC_QUEUE); |
| 294 | /* WaFbcDisableDpfcClockGating */ | 294 | /* WaFbcDisableDpfcClockGating:hsw */ |
| 295 | I915_WRITE(HSW_CLKGATE_DISABLE_PART_1, | 295 | I915_WRITE(HSW_CLKGATE_DISABLE_PART_1, |
| 296 | I915_READ(HSW_CLKGATE_DISABLE_PART_1) | | 296 | I915_READ(HSW_CLKGATE_DISABLE_PART_1) | |
| 297 | HSW_DPFC_GATING_DISABLE); | 297 | HSW_DPFC_GATING_DISABLE); |
