diff options
author | Dave Airlie <airlied@redhat.com> | 2010-05-07 02:42:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 03:40:11 -0400 |
commit | eb1f8e4f3be898df808e2dfc131099f5831d491d (patch) | |
tree | 9e5807824c60601f23016f3a2e82f8de10f7435a /drivers/gpu/drm/i915/intel_display.c | |
parent | 0ddfa7d574e0f3a7510b0be6c8ed807af017223f (diff) |
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_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3836f56e842c..4d739a1b13ca 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -4959,6 +4959,7 @@ intel_user_framebuffer_create(struct drm_device *dev, | |||
4959 | 4959 | ||
4960 | static const struct drm_mode_config_funcs intel_mode_funcs = { | 4960 | static const struct drm_mode_config_funcs intel_mode_funcs = { |
4961 | .fb_create = intel_user_framebuffer_create, | 4961 | .fb_create = intel_user_framebuffer_create, |
4962 | .output_poll_changed = intel_fb_output_poll_changed, | ||
4962 | }; | 4963 | }; |
4963 | 4964 | ||
4964 | static struct drm_gem_object * | 4965 | static struct drm_gem_object * |
@@ -5346,6 +5347,7 @@ void intel_modeset_cleanup(struct drm_device *dev) | |||
5346 | 5347 | ||
5347 | mutex_lock(&dev->struct_mutex); | 5348 | mutex_lock(&dev->struct_mutex); |
5348 | 5349 | ||
5350 | drm_kms_helper_poll_fini(dev); | ||
5349 | intel_fbdev_fini(dev); | 5351 | intel_fbdev_fini(dev); |
5350 | 5352 | ||
5351 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | 5353 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |