From: Daniel Vetter Subject: Re: [PATCH 3/3] drm/i915: cancel the panel VDD work when we do it manually Date: Thu, 31 Oct 2013 12:11:19 +0100 Message-ID: <20131031111119.GH4167@phenom.ffwll.local> References: <1383169828-1589-1-git-send-email-przanoni@gmail.com> <1383169828-1589-3-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-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 90884EE6B1 for ; Thu, 31 Oct 2013 04:10:55 -0700 (PDT) Received: by mail-ea0-f170.google.com with SMTP id q10so1081590eaj.29 for ; Thu, 31 Oct 2013 04:10:53 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1383169828-1589-3-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Wed, Oct 30, 2013 at 07:50:28PM -0200, Paulo Zanoni wrote: > 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); This will deadlock since we hold the mode_config.mutex here, and the panel_vdd_work also needs that. I've merged the other two patches. -Daniel > ironlake_panel_vdd_off_sync(intel_dp); > } else { > /* > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch