drm/i915: Extract intel_edp_fixup_vbt_bpp()

We have the same "override eDP VBT bpp with the current bpp" code
duplciated in two places. Extract it to a helper function.

TODO: Having this in .get_config() is pretty ugly. Should probably
try to move it somewhere else (setup_hw_state()/etc.)...

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220510104242.6099-3-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index 5a957ac..82ad8fe 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -395,26 +395,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
                intel_dotclock_calculate(pipe_config->port_clock,
                                         &pipe_config->dp_m_n);
 
-       if (intel_dp_is_edp(intel_dp) && dev_priv->vbt.edp.bpp &&
-           pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {
-               /*
-                * This is a big fat ugly hack.
-                *
-                * Some machines in UEFI boot mode provide us a VBT that has 18
-                * bpp and 1.62 GHz link bandwidth for eDP, which for reasons
-                * unknown we fail to light up. Yet the same BIOS boots up with
-                * 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as
-                * max, not what it tells us to use.
-                *
-                * Note: This will still be broken if the eDP panel is not lit
-                * up by the BIOS, and thus we can't get the mode at module
-                * load.
-                */
-               drm_dbg_kms(&dev_priv->drm,
-                           "pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
-                           pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp);
-               dev_priv->vbt.edp.bpp = pipe_config->pipe_bpp;
-       }
+       if (intel_dp_is_edp(intel_dp))
+               intel_edp_fixup_vbt_bpp(encoder, pipe_config->pipe_bpp);
 }
 
 static void

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index d9f238e..14547d6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3433,26 +3433,8 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
        pipe_config->has_audio =
                intel_ddi_is_audio_enabled(dev_priv, cpu_transcoder);
 
-       if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp &&
-           pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {
-               /*
-                * This is a big fat ugly hack.
-                *
-                * Some machines in UEFI boot mode provide us a VBT that has 18
-                * bpp and 1.62 GHz link bandwidth for eDP, which for reasons
-                * unknown we fail to light up. Yet the same BIOS boots up with
-                * 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as
-                * max, not what it tells us to use.
-                *
-                * Note: This will still be broken if the eDP panel is not lit
-                * up by the BIOS, and thus we can't get the mode at module
-                * load.
-                */
-               drm_dbg_kms(&dev_priv->drm,
-                           "pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
-                           pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp);
-               dev_priv->vbt.edp.bpp = pipe_config->pipe_bpp;
-       }
+       if (encoder->type == INTEL_OUTPUT_EDP)
+               intel_edp_fixup_vbt_bpp(encoder, pipe_config->pipe_bpp);
 
        ddi_dotclock_get(pipe_config);
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 0deba9d..688bf3a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2709,6 +2709,31 @@ static void intel_edp_mso_mode_fixup(struct intel_connector *connector,
                    DRM_MODE_ARG(mode));
 }
 
+void intel_edp_fixup_vbt_bpp(struct intel_encoder *encoder, int pipe_bpp)
+{
+       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+
+       if (dev_priv->vbt.edp.bpp && pipe_bpp > dev_priv->vbt.edp.bpp) {
+               /*
+                * This is a big fat ugly hack.
+                *
+                * Some machines in UEFI boot mode provide us a VBT that has 18
+                * bpp and 1.62 GHz link bandwidth for eDP, which for reasons
+                * unknown we fail to light up. Yet the same BIOS boots up with
+                * 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as
+                * max, not what it tells us to use.
+                *
+                * Note: This will still be broken if the eDP panel is not lit
+                * up by the BIOS, and thus we can't get the mode at module
+                * load.
+                */
+               drm_dbg_kms(&dev_priv->drm,
+                           "pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
+                           pipe_bpp, dev_priv->vbt.edp.bpp);
+               dev_priv->vbt.edp.bpp = pipe_bpp;
+       }
+}
+
 static void intel_edp_mso_init(struct intel_dp *intel_dp)
 {
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);

diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index d457e17..e794d91 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -63,6 +63,7 @@ enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *dig_port,
 void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state,
                            const struct drm_connector_state *conn_state);
 void intel_edp_backlight_off(const struct drm_connector_state *conn_state);
+void intel_edp_fixup_vbt_bpp(struct intel_encoder *encoder, int pipe_bpp);
 void intel_dp_mst_suspend(struct drm_i915_private *dev_priv);
 void intel_dp_mst_resume(struct drm_i915_private *dev_priv);
 int intel_dp_max_link_rate(struct intel_dp *intel_dp);