Skip to content

Commit

Permalink
drm/i915/pps: Let calling intel_pps_vdd_{on, off}_unlocked() w/o PPS …
Browse files Browse the repository at this point in the history
…lock held

After a follow-up change on non-eDP outputs
intel_pps_vdd_{on,off}_unlocked() can be called without the PPS lock
held, allow for this.

Suggested-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/20250324180145.142884-2-imre.deak@intel.com
  • Loading branch information
Imre Deak committed Mar 25, 2025
1 parent 93e7a4c commit 88f931c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/i915/display/intel_pps.c
Original file line number Diff line number Diff line change
Expand Up @@ -744,11 +744,11 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp)
i915_reg_t pp_stat_reg, pp_ctrl_reg;
bool need_to_disable = !intel_dp->pps.want_panel_vdd;

lockdep_assert_held(&display->pps.mutex);

if (!intel_dp_is_edp(intel_dp))
return false;

lockdep_assert_held(&display->pps.mutex);

cancel_delayed_work(&intel_dp->pps.panel_vdd_work);
intel_dp->pps.want_panel_vdd = true;

Expand Down Expand Up @@ -925,11 +925,11 @@ void intel_pps_vdd_off_unlocked(struct intel_dp *intel_dp, bool sync)
{
struct intel_display *display = to_intel_display(intel_dp);

lockdep_assert_held(&display->pps.mutex);

if (!intel_dp_is_edp(intel_dp))
return;

lockdep_assert_held(&display->pps.mutex);

INTEL_DISPLAY_STATE_WARN(display, !intel_dp->pps.want_panel_vdd,
"[ENCODER:%d:%s] %s VDD not forced on",
dp_to_dig_port(intel_dp)->base.base.base.id,
Expand Down

0 comments on commit 88f931c

Please sign in to comment.