diff options
| author |   Dave Airlie <airlied@redhat.com> | 2010-05-07 06:42:51 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 17:40:11 +1000 |
| commit | eb1f8e4f3be898df808e2dfc131099f5831d491d (patch) | |
| tree | 9e5807824c60601f23016f3a2e82f8de10f7435a /drivers/gpu/drm/i915/intel_crt.c | |
| parent | drm: off by one in drm_edid.c (diff) | |
| download | linux-dev-eb1f8e4f3be898df808e2dfc131099f5831d491d.tar.xz linux-dev-eb1f8e4f3be898df808e2dfc131099f5831d491d.zip | |
drm/fbdev: rework output polling to be back in the core. (v4)
After thinking it over a lot it made more sense for the core to deal with
the output polling especially so it can notify X.
v2: drop plans for fake connector - per Michel's comments - fix X patch sent to xorg-devel, add intel polled/hpd setting, add initial nouveau polled/hpd settings.
v3: add config lock take inside polling, add intel/nouveau poll init/fini calls
v4: config lock was a bit agressive, only needed around connector list reading.
otherwise it could re-enter.
glisse: discard drm_helper_hpd_irq_event
v3: Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 26756cd34e3c..e16ac5a28c3c 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -577,5 +577,10 @@ void intel_crt_init(struct drm_device *dev) drm_sysfs_connector_add(connector); + if (I915_HAS_HOTPLUG(dev)) + connector->polled = DRM_CONNECTOR_POLL_HPD; + else + connector->polled = DRM_CONNECTOR_POLL_CONNECT; + dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS; } |