Commit 457e992b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/lvds: Pass fixed_mode to compute_is_dual_link_lvds() 



We want to eventually get rid of the connector->panel.fixed_mode
pointer so avoid using it during LVDS setup. Since this all
happens during the encoder init we already have the fixed_mode
around, just pass that in.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220311172428.14685-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 54b6af69

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

+4 −3
Original line number Diff line number Diff line
@@ -784,7 +784,8 @@ bool intel_is_dual_link_lvds(struct drm_i915_private *dev_priv) 
	return encoder && to_lvds_encoder(&encoder->base)->is_dual_link;

}



static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)

static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder,

				      const struct drm_display_mode *fixed_mode)

{

	struct drm_device *dev = lvds_encoder->base.base.dev;

	unsigned int val;
@@ -795,7 +796,7 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder) 
		return dev_priv->params.lvds_channel_mode == 2;



	/* single channel LVDS is limited to 112 MHz */

	if (lvds_encoder->attached_connector->panel.fixed_mode->clock > 112999)

	if (fixed_mode->clock > 112999)

		return true;



	if (dmi_check_system(intel_dual_link_lvds))
@@ -1004,7 +1005,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) 
	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);

	intel_backlight_setup(intel_connector, INVALID_PIPE);



	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);

	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder, fixed_mode);

	drm_dbg_kms(&dev_priv->drm, "detected %s-link lvds configuration\n",

		    lvds_encoder->is_dual_link ? "dual" : "single");