diff mbox series

[6/8] drm/i915: Split intel_ddi_compute_min_voltage_level() into platform variants

Message ID 20231128115138.13238-7-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: cdclk/voltage_level cleanups and fixes | expand

Commit Message

Ville Syrjala Nov. 28, 2023, 11:51 a.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

The mess inside intel_ddi_compute_min_voltage_level() is illegible.
Clean it up a bit by splitting the internals into per-platform
functions.

TODO: make it a vfunc?

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 37 +++++++++++++++++++-----
 1 file changed, 30 insertions(+), 7 deletions(-)

Comments

Gustavo Sousa Dec. 1, 2023, 9:37 p.m. UTC | #1 
Quoting Ville Syrjala (2023-11-28 08:51:36-03:00)
>From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
>The mess inside intel_ddi_compute_min_voltage_level() is illegible.
>Clean it up a bit by splitting the internals into per-platform
>functions.
>
>TODO: make it a vfunc?
>
>Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/i915/display/intel_ddi.c | 37 +++++++++++++++++++-----
> 1 file changed, 30 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
>index 38f28c480b38..bcfcd7e789f0 100644
>--- a/drivers/gpu/drm/i915/display/intel_ddi.c
>+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
>@@ -3672,16 +3672,39 @@ static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
>                 AUDIO_OUTPUT_ENABLE(cpu_transcoder);
> }
> 
>+static int tgl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state)
>+{
>+        if (crtc_state->port_clock > 594000)
>+                return 2;
>+        else
>+                return 0;
>+}
>+
>+static int jsl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state)
>+{
>+        if (crtc_state->port_clock > 594000)
>+                return 3;
>+        else
>+                return 0;
>+}
>+
>+static int icl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state)
>+{
>+        if (crtc_state->port_clock > 594000)
>+                return 1;
>+        else
>+                return 0;
>+}
>+
> void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
>                                          struct intel_crtc_state *crtc_state)
> {
>-        if (DISPLAY_VER(dev_priv) >= 12 && crtc_state->port_clock > 594000)
>-                crtc_state->min_voltage_level = 2;
>-        else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
>-                 crtc_state->port_clock > 594000)
>-                crtc_state->min_voltage_level = 3;
>-        else if (DISPLAY_VER(dev_priv) >= 11 && crtc_state->port_clock > 594000)
>-                crtc_state->min_voltage_level = 1;
>+        if (DISPLAY_VER(dev_priv) >= 12)
>+                crtc_state->min_voltage_level = tgl_ddi_min_voltage_level(crtc_state);
>+        else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv))
>+                crtc_state->min_voltage_level = jsl_ddi_min_voltage_level(crtc_state);
>+        else if (DISPLAY_VER(dev_priv) >= 11)
>+                crtc_state->min_voltage_level = icl_ddi_min_voltage_level(crtc_state);
> }
> 
> static enum transcoder bdw_transcoder_master_readout(struct drm_i915_private *dev_priv,
>-- 
>2.41.0
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 38f28c480b38..bcfcd7e789f0 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3672,16 +3672,39 @@  static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
 		AUDIO_OUTPUT_ENABLE(cpu_transcoder);
 }
 
+static int tgl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state)
+{
+	if (crtc_state->port_clock > 594000)
+		return 2;
+	else
+		return 0;
+}
+
+static int jsl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state)
+{
+	if (crtc_state->port_clock > 594000)
+		return 3;
+	else
+		return 0;
+}
+
+static int icl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state)
+{
+	if (crtc_state->port_clock > 594000)
+		return 1;
+	else
+		return 0;
+}
+
 void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
 					 struct intel_crtc_state *crtc_state)
 {
-	if (DISPLAY_VER(dev_priv) >= 12 && crtc_state->port_clock > 594000)
-		crtc_state->min_voltage_level = 2;
-	else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
-		 crtc_state->port_clock > 594000)
-		crtc_state->min_voltage_level = 3;
-	else if (DISPLAY_VER(dev_priv) >= 11 && crtc_state->port_clock > 594000)
-		crtc_state->min_voltage_level = 1;
+	if (DISPLAY_VER(dev_priv) >= 12)
+		crtc_state->min_voltage_level = tgl_ddi_min_voltage_level(crtc_state);
+	else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv))
+		crtc_state->min_voltage_level = jsl_ddi_min_voltage_level(crtc_state);
+	else if (DISPLAY_VER(dev_priv) >= 11)
+		crtc_state->min_voltage_level = icl_ddi_min_voltage_level(crtc_state);
 }
 
 static enum transcoder bdw_transcoder_master_readout(struct drm_i915_private *dev_priv,