aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2012-10-25 15:15:44 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-11 17:51:35 -0500
commit2d809570c8d72b9529ebb72c9d35fa0bf08c033c (patch)
tree774944f0fdefef783d4cb47f55a464088ec7cf46 /drivers
parent5c9664d75a65adcdb9763a6df1da1d8d3f417c0c (diff)
drm/i915: implement WaDisableVLVClockGating_VBIIssue on VLV
This allows us to get the right vblank interrupt frequency. v2: pull in register definition Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Antti Koskipää <antti.koskipaa@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h2
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c7
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 5a1a984d74c9..2aff1bbcfc83 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -556,6 +556,8 @@
556#define IIR 0x020a4 556#define IIR 0x020a4
557#define IMR 0x020a8 557#define IMR 0x020a8
558#define ISR 0x020ac 558#define ISR 0x020ac
559#define VLV_GUNIT_CLOCK_GATE 0x182060
560#define GCFG_DIS (1<<8)
559#define VLV_IIR_RW 0x182084 561#define VLV_IIR_RW 0x182084
560#define VLV_IER 0x1820a0 562#define VLV_IER 0x1820a0
561#define VLV_IIR 0x1820a4 563#define VLV_IIR 0x1820a4
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 871bfe49b913..10e6d6c21960 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3755,6 +3755,13 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
3755 PIPEA_HLINE_INT_EN | PIPEA_VBLANK_INT_EN | 3755 PIPEA_HLINE_INT_EN | PIPEA_VBLANK_INT_EN |
3756 SPRITEB_FLIPDONE_INT_EN | SPRITEA_FLIPDONE_INT_EN | 3756 SPRITEB_FLIPDONE_INT_EN | SPRITEA_FLIPDONE_INT_EN |
3757 PLANEA_FLIPDONE_INT_EN); 3757 PLANEA_FLIPDONE_INT_EN);
3758
3759 /*
3760 * WaDisableVLVClockGating_VBIIssue
3761 * Disable clock gating on th GCFG unit to prevent a delay
3762 * in the reporting of vblank events.
3763 */
3764 I915_WRITE(VLV_GUNIT_CLOCK_GATE, GCFG_DIS);
3758} 3765}
3759 3766
3760static void g4x_init_clock_gating(struct drm_device *dev) 3767static void g4x_init_clock_gating(struct drm_device *dev)