summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_reg.h
diff options
context:
space:
mode:
authorPaulo Zanoni2013-07-13 01:00:08 +0200
committerDaniel Vetter2013-07-19 18:09:28 +0200
commitb518421f5f91365a08ebe55497b32fe6d90ef4df (patch)
tree1309ae32a27a75912c67daae94b90e68bbfc536f /drivers/gpu/drm/i915/i915_reg.h
parentdrm/i915: add ILK/SNB support to ivybridge_irq_handler (diff)
downloadkernel-qcow2-linux-b518421f5f91365a08ebe55497b32fe6d90ef4df.tar.gz
kernel-qcow2-linux-b518421f5f91365a08ebe55497b32fe6d90ef4df.tar.xz
kernel-qcow2-linux-b518421f5f91365a08ebe55497b32fe6d90ef4df.zip
drm/i915: kill Ivybridge vblank irq vfuncs
The IVB funtions are exactly the same as the ILK ones, with the exception of the bit register. So add IVB/HSW support to ironlake_enable_vblank and ironlake_disable_vblank, then kill the ivybridge functions. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 1d710966983e..e20f0937b3ec 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3787,6 +3787,9 @@
#define DE_PLANEA_FLIP_DONE_IVB (1<<3)
#define DE_PIPEA_VBLANK_IVB (1<<0)
+#define DE_PIPE_VBLANK_ILK(pipe) (1 << ((pipe * 8) + 7))
+#define DE_PIPE_VBLANK_IVB(pipe) (1 << (pipe * 5))
+
#define VLV_MASTER_IER 0x4400c /* Gunit master IER */
#define MASTER_INTERRUPT_ENABLE (1<<31)