From: Egbert Eich Date: Tue, 25 Nov 2014 11:54:57 +0000 (+0100) Subject: drm/i915/eDP: When enabling panel VDD cancel pending disable worker X-Git-Tag: v3.19-rc1~73^2~9^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2c623c11c7d87ada0121c5502358b30c9a849d2d;p=~emulex%2Finfiniband.git drm/i915/eDP: When enabling panel VDD cancel pending disable worker Before testing if the panel VDD is enabled on eDP cancel any pending disable worker. This makes sure the worker will be triggered with a delay from the last time edp_panel_vdd_schedule_off() is called, not the first time. This avoids unnecessary overhead. https://bugs.freedesktop.org/show_bug.cgi?id=86201 v2: use cancel_delayed_work() instead of cancel_delayed_work_sync() as the pps_mutexes will provide the required serialization with edp_panel_vdd_work() while the sync variant may deadlock. Suggested by Ville Syrjälä . Made commit message a bit clearer. Signed-off-by: Egbert Eich Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index d2529ec280c..5cecc20efa7 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1503,6 +1503,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp) if (!is_edp(intel_dp)) return false; + cancel_delayed_work(&intel_dp->panel_vdd_work); intel_dp->want_panel_vdd = true; if (edp_have_panel_vdd(intel_dp))