drm/i915: Refactor VBT fixed mode handling

LVDS and eDP have essentially the same code for grabbing the
fixed mode from VBT. Pull that code to a common location.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321132446.22394-3-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5096e99ffaadcaa3d7a84024cc1f8bab0bee396d..57d769bca3b8441b1474e86abd73883d101857dc 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -7114,15 +7114,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
                downclock_mode = intel_dp_drrs_init(intel_connector, fixed_mode);
 
        /* fallback to VBT if available for eDP */
-       if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) {
-               fixed_mode = drm_mode_duplicate(dev,
-                                       dev_priv->vbt.lfp_lvds_vbt_mode);
-               if (fixed_mode) {
-                       fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
-                       connector->display_info.width_mm = fixed_mode->width_mm;
-                       connector->display_info.height_mm = fixed_mode->height_mm;
-               }
-       }
+       if (!fixed_mode)
+               fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);
        mutex_unlock(&dev->mode_config.mutex);
 
        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 30cb9f39c7a29f5e3ef872b7a20a5b49967a5042..5f9764835487d9141082fc2fec06eecf1305a364 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -2159,6 +2159,8 @@ extern struct drm_display_mode *intel_find_panel_downclock(
                                struct drm_connector *connector);
 struct drm_display_mode *
 intel_panel_edid_fixed_mode(struct intel_connector *connector);
+struct drm_display_mode *
+intel_panel_vbt_fixed_mode(struct intel_connector *connector);
 
 #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
 int intel_backlight_device_register(struct intel_connector *connector);

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 0686ad1f12df7b40eed696c526319d8feb0cba84..ccd5ac6d3fcd592d2b80b2b17f461811242b49f4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -953,18 +953,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
                goto out;
 
        /* Failed to get EDID, what about VBT? */
-       if (dev_priv->vbt.lfp_lvds_vbt_mode) {
-               DRM_DEBUG_KMS("using mode from VBT: ");
-               drm_mode_debug_printmodeline(dev_priv->vbt.lfp_lvds_vbt_mode);
-
-               fixed_mode = drm_mode_duplicate(dev, dev_priv->vbt.lfp_lvds_vbt_mode);
-               if (fixed_mode) {
-                       fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
-                       connector->display_info.width_mm = fixed_mode->width_mm;
-                       connector->display_info.height_mm = fixed_mode->height_mm;
-                       goto out;
-               }
-       }
+       fixed_mode = intel_panel_vbt_fixed_mode(intel_connector);
+       if (fixed_mode)
+               goto out;
 
        /*
         * If we didn't get EDID, try checking if the panel is already turned

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index b9ee18c2dff5bd9944cb4ed7bb9c0ec76d518933..cf111eba1a935b705d920ac0c83aa0c1c73238ca 100644 (file)
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -141,6 +141,33 @@ intel_panel_edid_fixed_mode(struct intel_connector *connector)
        return fixed_mode;
 }
 
+struct drm_display_mode *
+intel_panel_vbt_fixed_mode(struct intel_connector *connector)
+{
+       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+       struct drm_display_info *info = &connector->base.display_info;
+       struct drm_display_mode *fixed_mode;
+
+       if (!dev_priv->vbt.lfp_lvds_vbt_mode)
+               return NULL;
+
+       fixed_mode = drm_mode_duplicate(&dev_priv->drm,
+                                       dev_priv->vbt.lfp_lvds_vbt_mode);
+       if (!fixed_mode)
+               return NULL;
+
+       fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
+
+       DRM_DEBUG_KMS("[CONNECTOR:%d:%s] using mode from VBT: ",
+                     connector->base.base.id, connector->base.name);
+       drm_mode_debug_printmodeline(fixed_mode);
+
+       info->width_mm = fixed_mode->width_mm;
+       info->height_mm = fixed_mode->height_mm;
+
+       return fixed_mode;
+}
+
 /* adjusted_mode has been preset to be the panel's fixed mode */
 void
 intel_pch_panel_fitting(struct intel_crtc *intel_crtc,