Commit 3a3dd534 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/display: Renaming DRRS functions to intel_drrs_*() 



We had a mix of intel_edp_drrs_*(), intel_dp_drrs_*() and
intel_dp_set_drrs_state(), so properly renaming all functions to
keep the same pattern.

While at it, also dropping intel_dp_set_drrs_state from the
documentation as it is a static function.

v3:
- dropping documentation style comment in static function
(intel_drrs_set_state)

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210827174253.51122-3-jose.souza@intel.com
parent a1b63119

Documentation/gpu/i915.rst

+5 −8
Original line number Diff line number Diff line
@@ -187,22 +187,19 @@ Display Refresh Rate Switching (DRRS) 
   :doc: Display Refresh Rate Switching (DRRS)



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c

   :functions: intel_dp_set_drrs_state

   :functions: intel_drrs_enable



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c

   :functions: intel_edp_drrs_enable

   :functions: intel_drrs_disable



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c

   :functions: intel_edp_drrs_disable

   :functions: intel_drrs_invalidate



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c

   :functions: intel_edp_drrs_invalidate

   :functions: intel_drrs_flush



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c

   :functions: intel_edp_drrs_flush



.. kernel-doc:: drivers/gpu/drm/i915/display/intel_drrs.c

   :functions: intel_dp_drrs_init

   :functions: intel_drrs_init



DPIO

----

drivers/gpu/drm/i915/display/intel_ddi.c

+3 −3
Original line number Diff line number Diff line
@@ -3015,7 +3015,7 @@ static void intel_enable_ddi_dp(struct intel_atomic_state *state, 
	if (!dig_port->lspcon.active || dig_port->dp.has_hdmi_sink)

		intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);



	intel_edp_drrs_enable(intel_dp, crtc_state);

	intel_drrs_enable(intel_dp, crtc_state);



	if (crtc_state->has_audio)

		intel_audio_codec_enable(encoder, crtc_state, conn_state);
@@ -3203,7 +3203,7 @@ static void intel_pre_disable_ddi(struct intel_atomic_state *state, 
		return;



	intel_dp = enc_to_intel_dp(encoder);

	intel_edp_drrs_disable(intel_dp, old_crtc_state);

	intel_drrs_disable(intel_dp, old_crtc_state);

	intel_psr_disable(intel_dp, old_crtc_state);

}
@@ -3233,7 +3233,7 @@ static void intel_ddi_update_pipe_dp(struct intel_atomic_state *state, 


	intel_psr_update(intel_dp, crtc_state, conn_state);

	intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);

	intel_edp_drrs_update(intel_dp, crtc_state);

	intel_drrs_update(intel_dp, crtc_state);



	intel_backlight_update(state, encoder, crtc_state, conn_state);

}

drivers/gpu/drm/i915/display/intel_display_debugfs.c

+2 −4
Original line number Diff line number Diff line
@@ -2045,11 +2045,9 @@ static int i915_drrs_ctl_set(void *data, u64 val) 


			intel_dp = enc_to_intel_dp(encoder);

			if (val)

				intel_edp_drrs_enable(intel_dp,

						      crtc_state);

				intel_drrs_enable(intel_dp, crtc_state);

			else

				intel_edp_drrs_disable(intel_dp,

						       crtc_state);

				intel_drrs_disable(intel_dp, crtc_state);

		}

		drm_connector_list_iter_end(&conn_iter);

drivers/gpu/drm/i915/display/intel_dp.c

+3 −3
Original line number Diff line number Diff line
@@ -1782,7 +1782,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, 


	intel_vrr_compute_config(pipe_config, conn_state);

	intel_psr_compute_config(intel_dp, pipe_config);

	intel_dp_drrs_compute_config(intel_dp, pipe_config, output_bpp,

	intel_drrs_compute_config(intel_dp, pipe_config, output_bpp,

				  constant_n);

	intel_dp_compute_vsc_sdp(intel_dp, pipe_config, conn_state);

	intel_dp_compute_hdr_metadata_infoframe_sdp(intel_dp, pipe_config, conn_state);
@@ -4802,7 +4802,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, 


	fixed_mode = intel_panel_edid_fixed_mode(intel_connector);

	if (fixed_mode)

		downclock_mode = intel_dp_drrs_init(intel_connector, fixed_mode);

		downclock_mode = intel_drrs_init(intel_connector, fixed_mode);



	/* multiply the mode clock and horizontal timings for MSO */

	intel_edp_mso_mode_fixup(intel_connector, fixed_mode);

drivers/gpu/drm/i915/display/intel_drrs.c

+45 −58
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
 * no movement on screen, after a timeout of 1 second, a switch to low RR is

 * made.

 *

 * For integration with frontbuffer tracking code, intel_edp_drrs_invalidate()

 * and intel_edp_drrs_flush() are called.

 * For integration with frontbuffer tracking code, intel_drrs_invalidate()

 * and intel_drrs_flush() are called.

 *

 * DRRS can be further extended to support other internal panels and also

 * the scenario of video playback wherein RR is set based on the rate
@@ -48,7 +48,7 @@ 
 */



void

intel_dp_drrs_compute_config(struct intel_dp *intel_dp,

intel_drrs_compute_config(struct intel_dp *intel_dp,

			  struct intel_crtc_state *pipe_config,

			  int output_bpp, bool constant_n)

{
@@ -62,7 +62,7 @@ intel_dp_drrs_compute_config(struct intel_dp *intel_dp, 
	/*

	 * DRRS and PSR can't be enable together, so giving preference to PSR

	 * as it allows more power-savings by complete shutting down display,

	 * so to guarantee this, intel_dp_drrs_compute_config() must be called

	 * so to guarantee this, intel_drrs_compute_config() must be called

	 * after intel_psr_compute_config().

	 */

	if (pipe_config->has_psr)
@@ -87,20 +87,7 @@ intel_dp_drrs_compute_config(struct intel_dp *intel_dp, 
		pipe_config->dp_m2_n2.gmch_m *= pipe_config->splitter.link_count;

}



/**

 * intel_dp_set_drrs_state - program registers for RR switch to take effect

 * @dev_priv: i915 device

 * @crtc_state: a pointer to the active intel_crtc_state

 * @refresh_rate: RR to be programmed

 *

 * This function gets called when refresh rate (RR) has to be changed from

 * one frequency to another. Switches can be between high and low RR

 * supported by the panel or to any other RR based on media playback (in

 * this case, RR value needs to be passed from user space).

 *

 * The caller of this function needs to take a lock on dev_priv->drrs.

 */

static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,

static void intel_drrs_set_state(struct drm_i915_private *dev_priv,

				 const struct intel_crtc_state *crtc_state,

				 int refresh_rate)

{
@@ -185,7 +172,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, 
}



static void

intel_edp_drrs_enable_locked(struct intel_dp *intel_dp)

intel_drrs_enable_locked(struct intel_dp *intel_dp)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -194,13 +181,13 @@ intel_edp_drrs_enable_locked(struct intel_dp *intel_dp) 
}



/**

 * intel_edp_drrs_enable - init drrs struct if supported

 * intel_drrs_enable - init drrs struct if supported

 * @intel_dp: DP struct

 * @crtc_state: A pointer to the active crtc state.

 *

 * Initializes frontbuffer_bits and drrs.dp

 */

void intel_edp_drrs_enable(struct intel_dp *intel_dp,

void intel_drrs_enable(struct intel_dp *intel_dp,

		       const struct intel_crtc_state *crtc_state)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -217,14 +204,14 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp, 
		goto unlock;

	}



	intel_edp_drrs_enable_locked(intel_dp);

	intel_drrs_enable_locked(intel_dp);



unlock:

	mutex_unlock(&dev_priv->drrs.mutex);

}



static void

intel_edp_drrs_disable_locked(struct intel_dp *intel_dp,

intel_drrs_disable_locked(struct intel_dp *intel_dp,

			  const struct intel_crtc_state *crtc_state)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -233,19 +220,19 @@ intel_edp_drrs_disable_locked(struct intel_dp *intel_dp, 
		int refresh;



		refresh = drm_mode_vrefresh(intel_dp->attached_connector->panel.fixed_mode);

		intel_dp_set_drrs_state(dev_priv, crtc_state, refresh);

		intel_drrs_set_state(dev_priv, crtc_state, refresh);

	}



	dev_priv->drrs.dp = NULL;

}



/**

 * intel_edp_drrs_disable - Disable DRRS

 * intel_drrs_disable - Disable DRRS

 * @intel_dp: DP struct

 * @old_crtc_state: Pointer to old crtc_state.

 *

 */

void intel_edp_drrs_disable(struct intel_dp *intel_dp,

void intel_drrs_disable(struct intel_dp *intel_dp,

			const struct intel_crtc_state *old_crtc_state)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -259,23 +246,23 @@ void intel_edp_drrs_disable(struct intel_dp *intel_dp, 
		return;

	}



	intel_edp_drrs_disable_locked(intel_dp, old_crtc_state);

	intel_drrs_disable_locked(intel_dp, old_crtc_state);

	mutex_unlock(&dev_priv->drrs.mutex);



	cancel_delayed_work_sync(&dev_priv->drrs.work);

}



/**

 * intel_edp_drrs_update - Update DRRS state

 * intel_drrs_update - Update DRRS state

 * @intel_dp: Intel DP

 * @crtc_state: new CRTC state

 *

 * This function will update DRRS states, disabling or enabling DRRS when

 * executing fastsets. For full modeset, intel_edp_drrs_disable() and

 * intel_edp_drrs_enable() should be called instead.

 * executing fastsets. For full modeset, intel_drrs_disable() and

 * intel_drrs_enable() should be called instead.

 */

void

intel_edp_drrs_update(struct intel_dp *intel_dp,

intel_drrs_update(struct intel_dp *intel_dp,

		  const struct intel_crtc_state *crtc_state)

{

	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -290,15 +277,15 @@ intel_edp_drrs_update(struct intel_dp *intel_dp, 
		goto unlock;



	if (crtc_state->has_drrs)

		intel_edp_drrs_enable_locked(intel_dp);

		intel_drrs_enable_locked(intel_dp);

	else

		intel_edp_drrs_disable_locked(intel_dp, crtc_state);

		intel_drrs_disable_locked(intel_dp, crtc_state);



unlock:

	mutex_unlock(&dev_priv->drrs.mutex);

}



static void intel_edp_drrs_downclock_work(struct work_struct *work)

static void intel_drrs_downclock_work(struct work_struct *work)

{

	struct drm_i915_private *dev_priv =

		container_of(work, typeof(*dev_priv), drrs.work.work);
@@ -322,7 +309,7 @@ static void intel_edp_drrs_downclock_work(struct work_struct *work) 
	if (dev_priv->drrs.refresh_rate_type != DRRS_LOW_RR) {

		struct drm_crtc *crtc = dp_to_dig_port(intel_dp)->base.base.crtc;



		intel_dp_set_drrs_state(dev_priv, to_intel_crtc(crtc)->config,

		intel_drrs_set_state(dev_priv, to_intel_crtc(crtc)->config,

				     drm_mode_vrefresh(intel_dp->attached_connector->panel.downclock_mode));

	}
@@ -331,7 +318,7 @@ static void intel_edp_drrs_downclock_work(struct work_struct *work) 
}



/**

 * intel_edp_drrs_invalidate - Disable Idleness DRRS

 * intel_drrs_invalidate - Disable Idleness DRRS

 * @dev_priv: i915 device

 * @frontbuffer_bits: frontbuffer plane tracking bits

 *
@@ -340,7 +327,7 @@ static void intel_edp_drrs_downclock_work(struct work_struct *work) 
 *

 * Dirty frontbuffers relevant to DRRS are tracked in busy_frontbuffer_bits.

 */

void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,

void intel_drrs_invalidate(struct drm_i915_private *dev_priv,

			   unsigned int frontbuffer_bits)

{

	struct intel_dp *intel_dp;
@@ -368,14 +355,14 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv, 


	/* invalidate means busy screen hence upclock */

	if (frontbuffer_bits && dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR)

		intel_dp_set_drrs_state(dev_priv, to_intel_crtc(crtc)->config,

		intel_drrs_set_state(dev_priv, to_intel_crtc(crtc)->config,

				     drm_mode_vrefresh(intel_dp->attached_connector->panel.fixed_mode));



	mutex_unlock(&dev_priv->drrs.mutex);

}



/**

 * intel_edp_drrs_flush - Restart Idleness DRRS

 * intel_drrs_flush - Restart Idleness DRRS

 * @dev_priv: i915 device

 * @frontbuffer_bits: frontbuffer plane tracking bits

 *
@@ -386,7 +373,7 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv, 
 *

 * Dirty frontbuffers relevant to DRRS are tracked in busy_frontbuffer_bits.

 */

void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,

void intel_drrs_flush(struct drm_i915_private *dev_priv,

		      unsigned int frontbuffer_bits)

{

	struct intel_dp *intel_dp;
@@ -414,7 +401,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv, 


	/* flush means busy screen hence upclock */

	if (frontbuffer_bits && dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR)

		intel_dp_set_drrs_state(dev_priv, to_intel_crtc(crtc)->config,

		intel_drrs_set_state(dev_priv, to_intel_crtc(crtc)->config,

				     drm_mode_vrefresh(intel_dp->attached_connector->panel.fixed_mode));



	/*
@@ -428,7 +415,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv, 
}



/**

 * intel_dp_drrs_init - Init basic DRRS work and mutex.

 * intel_drrs_init - Init basic DRRS work and mutex.

 * @connector: eDP connector

 * @fixed_mode: preferred mode of panel

 *
@@ -441,13 +428,13 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv, 
 * from VBT setting).

 */

struct drm_display_mode *

intel_dp_drrs_init(struct intel_connector *connector,

intel_drrs_init(struct intel_connector *connector,

		struct drm_display_mode *fixed_mode)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct drm_display_mode *downclock_mode = NULL;



	INIT_DELAYED_WORK(&dev_priv->drrs.work, intel_edp_drrs_downclock_work);

	INIT_DELAYED_WORK(&dev_priv->drrs.work, intel_drrs_downclock_work);

	mutex_init(&dev_priv->drrs.mutex);



	if (DISPLAY_VER(dev_priv) <= 6) {