> -----Original Message-----
> From: Intel-gfx <intel-gfx-boun...@lists.freedesktop.org> On Behalf Of Jani
> Nikula
> Sent: Tuesday, December 22, 2020 8:20 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nik...@intel.com>
> Subject: [Intel-gfx] [PATCH 02/13] drm/i915/pps: rename pps_{, un}lock ->
> intel_pps_{, un}lock
>
> Start following the usual naming pattern for functions.
LGTM.
Reviewed-by: Anshuman Gupta <anshuman.gu...@intel.com>
>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp.c | 20 ++++++++++----------
> drivers/gpu/drm/i915/display/intel_pps.c | 21 +++++++++++----------
> drivers/gpu/drm/i915/display/intel_pps.h | 8 ++++----
> 3 files changed, 25 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index d4760c478653..0870872fb594 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -1030,7 +1030,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
> aux_domain = intel_aux_power_domain(dig_port);
>
> aux_wakeref = intel_display_power_get(i915, aux_domain);
> - pps_wakeref = pps_lock(intel_dp);
> + pps_wakeref = intel_pps_lock(intel_dp);
>
> /*
> * We will be called with VDD already enabled for dpcd/edid/oui
> reads.
> @@ -1182,7 +1182,7 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
> if (vdd)
> edp_panel_vdd_off(intel_dp, false);
>
> - pps_unlock(intel_dp, pps_wakeref);
> + intel_pps_unlock(intel_dp, pps_wakeref);
> intel_display_power_put_async(i915, aux_domain, aux_wakeref);
>
> if (is_tc_port)
> @@ -3153,7 +3153,7 @@ static void intel_enable_dp(struct
> intel_atomic_state *state,
> if (drm_WARN_ON(&dev_priv->drm, dp_reg & DP_PORT_EN))
> return;
>
> - with_pps_lock(intel_dp, wakeref) {
> + with_intel_pps_lock(intel_dp, wakeref) {
> if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
> vlv_init_panel_power_sequencer(encoder,
> pipe_config);
>
> @@ -3719,7 +3719,7 @@ intel_dp_link_down(struct intel_encoder
> *encoder,
> if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> intel_wakeref_t wakeref;
>
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> intel_dp->active_pipe = INVALID_PIPE;
> }
> }
> @@ -5817,7 +5817,7 @@ void intel_dp_encoder_flush_work(struct
> drm_encoder *encoder)
> * vdd might still be enabled do to the delayed vdd off.
> * Make sure vdd is actually turned off here.
> */
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> edp_panel_vdd_off_sync(intel_dp);
> }
>
> @@ -5845,7 +5845,7 @@ void intel_dp_encoder_suspend(struct
> intel_encoder *intel_encoder)
> * Make sure vdd is actually turned off here.
> */
> cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> edp_panel_vdd_off_sync(intel_dp);
> }
>
> @@ -5857,7 +5857,7 @@ void intel_dp_encoder_shutdown(struct
> intel_encoder *intel_encoder)
> if (!intel_dp_is_edp(intel_dp))
> return;
>
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> wait_panel_power_cycle(intel_dp);
> }
>
> @@ -5889,7 +5889,7 @@ void intel_dp_encoder_reset(struct
> drm_encoder *encoder)
> !intel_dp_is_edp(intel_dp))
> return;
>
> - with_pps_lock(intel_dp, wakeref) {
> + with_intel_pps_lock(intel_dp, wakeref) {
> if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
> intel_dp->active_pipe = vlv_active_pipe(intel_dp);
>
> @@ -6628,7 +6628,7 @@ static bool intel_edp_init_connector(struct
> intel_dp *intel_dp,
> return false;
> }
>
> - with_pps_lock(intel_dp, wakeref) {
> + with_intel_pps_lock(intel_dp, wakeref) {
> intel_dp_init_panel_power_timestamps(intel_dp);
> intel_dp_pps_init(intel_dp);
> intel_edp_panel_vdd_sanitize(intel_dp);
> @@ -6705,7 +6705,7 @@ static bool intel_edp_init_connector(struct
> intel_dp *intel_dp,
> * vdd might still be enabled do to the delayed vdd off.
> * Make sure vdd is actually turned off here.
> */
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> edp_panel_vdd_off_sync(intel_dp);
>
> return false;
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.c
> b/drivers/gpu/drm/i915/display/intel_pps.c
> index cfe347076031..9b0c432552b7 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.c
> +++ b/drivers/gpu/drm/i915/display/intel_pps.c
> @@ -16,7 +16,7 @@ static void
> intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
> bool force_disable_vdd);
>
> -intel_wakeref_t pps_lock(struct intel_dp *intel_dp)
> +intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp)
> {
> struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> intel_wakeref_t wakeref;
> @@ -33,7 +33,8 @@ intel_wakeref_t pps_lock(struct intel_dp *intel_dp)
> return wakeref;
> }
>
> -intel_wakeref_t pps_unlock(struct intel_dp *intel_dp, intel_wakeref_t
> wakeref)
> +intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp,
> + intel_wakeref_t wakeref)
> {
> struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>
> @@ -633,7 +634,7 @@ void intel_edp_panel_vdd_on(struct intel_dp
> *intel_dp)
> return;
>
> vdd = false;
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> vdd = edp_panel_vdd_on(intel_dp);
> I915_STATE_WARN(!vdd, "[ENCODER:%d:%s] VDD already
> requested on\n",
> dp_to_dig_port(intel_dp)->base.base.base.id,
> @@ -688,7 +689,7 @@ void edp_panel_vdd_work(struct work_struct
> *__work)
> struct intel_dp, panel_vdd_work);
> intel_wakeref_t wakeref;
>
> - with_pps_lock(intel_dp, wakeref) {
> + with_intel_pps_lock(intel_dp, wakeref) {
> if (!intel_dp->want_panel_vdd)
> edp_panel_vdd_off_sync(intel_dp);
> }
> @@ -789,7 +790,7 @@ void intel_edp_panel_on(struct intel_dp *intel_dp)
> if (!intel_dp_is_edp(intel_dp))
> return;
>
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> edp_panel_on(intel_dp);
> }
>
> @@ -841,7 +842,7 @@ void intel_edp_panel_off(struct intel_dp *intel_dp)
> if (!intel_dp_is_edp(intel_dp))
> return;
>
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> edp_panel_off(intel_dp);
> }
>
> @@ -859,7 +860,7 @@ void _intel_edp_backlight_on(struct intel_dp
> *intel_dp)
> */
> wait_backlight_on(intel_dp);
>
> - with_pps_lock(intel_dp, wakeref) {
> + with_intel_pps_lock(intel_dp, wakeref) {
> i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> u32 pp;
>
> @@ -880,7 +881,7 @@ void _intel_edp_backlight_off(struct intel_dp
> *intel_dp)
> if (!intel_dp_is_edp(intel_dp))
> return;
>
> - with_pps_lock(intel_dp, wakeref) {
> + with_intel_pps_lock(intel_dp, wakeref) {
> i915_reg_t pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
> u32 pp;
>
> @@ -907,7 +908,7 @@ void intel_edp_backlight_power(struct
> intel_connector *connector, bool enable)
> bool is_enabled;
>
> is_enabled = false;
> - with_pps_lock(intel_dp, wakeref)
> + with_intel_pps_lock(intel_dp, wakeref)
> is_enabled = ilk_get_pp_control(intel_dp) &
> EDP_BLC_ENABLE;
> if (is_enabled == enable)
> return;
> @@ -1057,7 +1058,7 @@ bool intel_edp_have_power(struct intel_dp
> *intel_dp)
> intel_wakeref_t wakeref;
> bool have_power = false;
>
> - with_pps_lock(intel_dp, wakeref) {
> + with_intel_pps_lock(intel_dp, wakeref) {
> have_power = edp_have_panel_power(intel_dp) &&
>
> edp_have_panel_vdd(intel_dp);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.h
> b/drivers/gpu/drm/i915/display/intel_pps.h
> index 76d5cc565501..f44e6ce9e8c1 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.h
> +++ b/drivers/gpu/drm/i915/display/intel_pps.h
> @@ -16,11 +16,11 @@ struct intel_crtc_state; struct intel_dp; struct
> intel_encoder;
>
> -intel_wakeref_t pps_lock(struct intel_dp *intel_dp); -intel_wakeref_t
> pps_unlock(struct intel_dp *intel_dp, intel_wakeref_t wakeref);
> +intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp);
> +intel_wakeref_t intel_pps_unlock(struct intel_dp *intel_dp,
> +intel_wakeref_t wakeref);
>
> -#define with_pps_lock(dp, wf)
> \
> - for ((wf) = pps_lock(dp); (wf); (wf) = pps_unlock((dp), (wf)))
> +#define with_intel_pps_lock(dp, wf)
> \
> + for ((wf) = intel_pps_lock(dp); (wf); (wf) = intel_pps_unlock((dp),
> +(wf)))
>
> void intel_dp_check_edp(struct intel_dp *intel_dp); void
> _intel_edp_backlight_on(struct intel_dp *intel_dp);
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
