drm/i915: Simplify intel_panel_add_edid_alt_fixed_modes()

[ Upstream commit d372ec94a018c3a19dad71e2ee3478126394d9fc ]

Since commit a5810f551d0a ("drm/i915: Allow more varied alternate
fixed modes for panels") intel_panel_add_edid_alt_fixed_modes()
no longer considers vrr vs. drrs separately. So no reason to
pass them as separate parameters either.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220927180615.25476-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
(cherry picked from commit eb89e83c152b122a94e79527d63cb7c79823c37e)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Stable-dep-of: 12caf46cf4fc ("drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index d4492b6d23d251095b88941206f602e2bc9c8dd1..21ba510716b6c043176c522eeef9fc91dd1d7eca 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5233,7 +5233,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
                              encoder->devdata, IS_ERR(edid) ? NULL : edid);
 
        intel_panel_add_edid_fixed_modes(intel_connector,
-                                        intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE,
+                                        intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE ||
                                         intel_vrr_is_capable(intel_connector));
 
        /* MSO requires information from the EDID */

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index 730480ac3300ddaa5096decc59afd5a0bd4865de..c0bec3e0f0ae9f3a56770cfca9d15efced1aae44 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -972,8 +972,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
 
        /* Try EDID first */
        intel_panel_add_edid_fixed_modes(intel_connector,
-                                        intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE,
-                                        false);
+                                        intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE);
 
        /* Failed to get EDID, what about VBT? */
        if (!intel_panel_preferred_fixed_mode(intel_connector))

diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
index cb44984bb9a2fc5b6dbb5eea9b238c53f17bea9e..1e008922b95d3664578e4bc2d86568acdc6eae59 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_panel.c
+++ b/drivers/gpu/drm/i915/display/intel_panel.c
@@ -238,10 +238,10 @@ static void intel_panel_destroy_probed_modes(struct intel_connector *connector)
 }
 
 void intel_panel_add_edid_fixed_modes(struct intel_connector *connector,
-                                     bool has_drrs, bool has_vrr)
+                                     bool use_alt_fixed_modes)
 {
        intel_panel_add_edid_preferred_mode(connector);
-       if (intel_panel_preferred_fixed_mode(connector) && (has_drrs || has_vrr))
+       if (intel_panel_preferred_fixed_mode(connector) && use_alt_fixed_modes)
                intel_panel_add_edid_alt_fixed_modes(connector);
        intel_panel_destroy_probed_modes(connector);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_panel.h b/drivers/gpu/drm/i915/display/intel_panel.h
index b087c0c3cc6db54610f2241f50c5896ed34e6986..4a94bd0eae3bfe646e99c81e62177bd35ba395f9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_panel.h
+++ b/drivers/gpu/drm/i915/display/intel_panel.h
@@ -41,7 +41,7 @@ int intel_panel_fitting(struct intel_crtc_state *crtc_state,
 int intel_panel_compute_config(struct intel_connector *connector,
                               struct drm_display_mode *adjusted_mode);
 void intel_panel_add_edid_fixed_modes(struct intel_connector *connector,
-                                     bool has_drrs, bool has_vrr);
+                                     bool use_alt_fixed_modes);
 void intel_panel_add_vbt_lfp_fixed_mode(struct intel_connector *connector);
 void intel_panel_add_vbt_sdvo_fixed_mode(struct intel_connector *connector);
 void intel_panel_add_encoder_fixed_mode(struct intel_connector *connector,

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index b5f65b093c1067f4814586fe0b3e451a19a3fca6..282820fe55b5b81e7c76c3f6d387260512a9957c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2901,7 +2901,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
 
        if (!intel_panel_preferred_fixed_mode(intel_connector)) {
                intel_ddc_get_modes(connector, &intel_sdvo->ddc);
-               intel_panel_add_edid_fixed_modes(intel_connector, false, false);
+               intel_panel_add_edid_fixed_modes(intel_connector, false);
        }
 
        intel_panel_init(intel_connector);