From 1ab0c20aea17a3eeb4fc092a213df037830c7aac Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 3 Oct 2010 19:36:26 -0700 Subject: [PATCH] --- yaml --- r: 218139 b: refs/heads/master c: f87ea7613126ace98c0cb8b86f58e16a0e539375 h: refs/heads/master i: 218137: 16d911354eb9893dbd838d6c4a5d782e35ba70d0 218135: 869bbf79e1abf438b3510050967e4c3a966784fa v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32e71135780e..1aea05736b82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58e10eb92d36a62568349d985c9140d9be16a99c +refs/heads/master: f87ea7613126ace98c0cb8b86f58e16a0e539375 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index a2e8e15b8f5a..f55b560c468f 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -6127,9 +6127,9 @@ void intel_modeset_cleanup(struct drm_device *dev) struct drm_crtc *crtc; struct intel_crtc *intel_crtc; + drm_kms_helper_poll_fini(dev); mutex_lock(&dev->struct_mutex); - drm_kms_helper_poll_fini(dev); intel_fbdev_fini(dev); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {