aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-01-02 16:33:00 -0500
committerDave Airlie <airlied@linux.ie>2009-01-06 20:49:47 -0500
commit7d57382e65994ab7d01741373bd1c420370aed9f (patch)
treeb0c3c5f9657a360db60c45b4c4091b7c027a637f /drivers/gpu/drm/i915/i915_drv.h
parent3f8bc370ac679a5fe5c098f30d3cf8e80f62a9f8 (diff)
drm/i915: Add support for integrated HDMI on G4X hardware.
This is ported directly from the userland 2D driver code. The HDMI audio bits aren't hooked up yet. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4756e5cd6b5e..563de18063fd 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -664,6 +664,7 @@ extern void intel_modeset_cleanup(struct drm_device *dev);
664 writel(upper_32_bits(val), dev_priv->regs + \ 664 writel(upper_32_bits(val), dev_priv->regs + \
665 (reg) + 4)) 665 (reg) + 4))
666#endif 666#endif
667#define POSTING_READ(reg) (void)I915_READ(reg)
667 668
668#define I915_VERBOSE 0 669#define I915_VERBOSE 0
669 670
@@ -760,6 +761,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
760 IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev)) 761 IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))
761 762
762#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev)) 763#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))
764#define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev))
763 765
764#define PRIMARY_RINGBUFFER_SIZE (128*1024) 766#define PRIMARY_RINGBUFFER_SIZE (128*1024)
765 767