diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-31 17:11:15 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-01 18:21:57 -0400 |
| commit | 5ca58282089b11f64b911618036ee7676f12735b (patch) | |
| tree | 4a53f11f1f0647ae28a4ba42269efc6b66d7b4fc /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 4a8df45894d26dc503013ea630927731c24be6b8 (diff) | |
drm/i915: add VGA hotplug support for 945+
Add VGA port hotplug detection to the i915 driver. When KMS is enabled,
plugging in or removing a VGA cable from the VGA connector will
generate a uevent, which indicates to userspace that it should re-probe
outputs on this device (to determine modes, etc.).
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[anholt: dropped extra PORT_HOTPLUG_STAT clear with ack from jbarnes]
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index c1685d0c704f..c0f48bb366bf 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -159,6 +159,9 @@ typedef struct drm_i915_private { | |||
| 159 | u32 irq_mask_reg; | 159 | u32 irq_mask_reg; |
| 160 | u32 pipestat[2]; | 160 | u32 pipestat[2]; |
| 161 | 161 | ||
| 162 | u32 hotplug_supported_mask; | ||
| 163 | struct work_struct hotplug_work; | ||
| 164 | |||
| 162 | int tex_lru_log_granularity; | 165 | int tex_lru_log_granularity; |
| 163 | int allow_batchbuffer; | 166 | int allow_batchbuffer; |
| 164 | struct mem_block *agp_heap; | 167 | struct mem_block *agp_heap; |
| @@ -810,6 +813,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
| 810 | #define HAS_128_BYTE_Y_TILING(dev) (IS_I9XX(dev) && !(IS_I915G(dev) || \ | 813 | #define HAS_128_BYTE_Y_TILING(dev) (IS_I9XX(dev) && !(IS_I915G(dev) || \ |
| 811 | IS_I915GM(dev))) | 814 | IS_I915GM(dev))) |
| 812 | #define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev)) | 815 | #define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev)) |
| 816 | #define I915_HAS_HOTPLUG(dev) (IS_I945G(dev) || IS_I945GM(dev) || IS_I965G(dev)) | ||
| 813 | 817 | ||
| 814 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) | 818 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) |
| 815 | 819 | ||