OSDN Git Service

drm/i915/lvds: Pass fixed_mode to compute_is_dual_link_lvds()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 11 Mar 2022 17:24:15 +0000 (19:24 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 14 Mar 2022 22:13:08 +0000 (00:13 +0200)
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220311172428.14685-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_lvds.c

index 9fced37..dd7292d 100644 (file)
@@ -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 @@ out:
        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");