From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:35281 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753888AbdBGMuB (ORCPT ); Tue, 7 Feb 2017 07:50:01 -0500 Received: by mail-wm0-f65.google.com with SMTP id u63so28105140wmu.2 for ; Tue, 07 Feb 2017 04:50:00 -0800 (PST) From: Chris Wilson To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Chris Wilson , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Daniel Vetter , Jani Nikula , Sean Paul , "# v4 . 9+" Subject: [PATCH 2/2] drm: Cancel drm_fb_helper_resume_work on unload Date: Tue, 7 Feb 2017 12:49:56 +0000 Message-Id: <20170207124956.14954-2-chris@chris-wilson.co.uk> In-Reply-To: <20170207124956.14954-1-chris@chris-wilson.co.uk> References: <20170207124956.14954-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: We can not allow the worker to run after its fbdev, or even the module, has been removed. Fixes: cfe63423d9be ("drm/fb-helper: Add drm_fb_helper_set_suspend_unlocked()") Signed-off-by: Chris Wilson Cc: Noralf Trønnes Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: dri-devel@lists.freedesktop.org Cc: # v4.9+ --- drivers/gpu/drm/drm_fb_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 2d0810c9f3dc..842c461b0b21 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -860,6 +860,7 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) if (!drm_fbdev_emulation) return; + cancel_work_sync(&fb_helper->resume_work); cancel_work_sync(&fb_helper->dirty_work); mutex_lock(&kernel_fb_helper_lock); -- 2.11.0