From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 3/3] drm/i915: cancel the panel VDD work when we do it manually Date: Wed, 30 Oct 2013 19:50:28 -0200 Message-ID: <1383169828-1589-3-git-send-email-przanoni@gmail.com> References: <1383169828-1589-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AD3AEE91B for ; Wed, 30 Oct 2013 14:50:52 -0700 (PDT) Received: by mail-vc0-f174.google.com with SMTP id ld13so1360809vcb.19 for ; Wed, 30 Oct 2013 14:50:52 -0700 (PDT) In-Reply-To: <1383169828-1589-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni After I reorganized the panel VDD debug messages I was able to spot we were disabling it one extra time. The problem is that we're missing the call to cancel the delayed work in one of the instances where we manually call ironlake_panel_vdd_off_sync(). Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_dp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 8db1fda..f2280b4 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1159,6 +1159,7 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync) intel_dp->want_panel_vdd = false; if (sync) { + cancel_delayed_work_sync(&intel_dp->panel_vdd_work); ironlake_panel_vdd_off_sync(intel_dp); } else { /* -- 1.8.3.1