drm/i915: Clean up EDID downclock mode lookup

Rename intel_find_panel_downclock() to intel_panel_edid_downclock_mode()
to make it clear it's looking for the downclock mode in the EDID.
And while at it polish the implementation a bit as well.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321132446.22394-6-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 57d769bca3b8441b1474e86abd73883d101857dc..326de12c3f44ae5c4204c8d16c55b4b854394e5a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -7033,9 +7033,7 @@ intel_dp_drrs_init(struct intel_connector *connector,
                return NULL;
        }
 
-       downclock_mode = intel_find_panel_downclock(dev_priv, fixed_mode,
-                                                   &connector->base);
-
+       downclock_mode = intel_panel_edid_downclock_mode(connector, fixed_mode);
        if (!downclock_mode) {
                DRM_DEBUG_KMS("Downclock mode is not found. DRRS not supported\n");
                return NULL;

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 5f9764835487d9141082fc2fec06eecf1305a364..14765a4b31a949acf266c8ed74bd187ccd6b4090 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -2153,10 +2153,9 @@ void intel_panel_update_backlight(struct intel_encoder *encoder,
                                  const struct intel_crtc_state *crtc_state,
                                  const struct drm_connector_state *conn_state);
 void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_state);
-extern struct drm_display_mode *intel_find_panel_downclock(
-                               struct drm_i915_private *dev_priv,
-                               struct drm_display_mode *fixed_mode,
-                               struct drm_connector *connector);
+struct drm_display_mode *
+intel_panel_edid_downclock_mode(struct intel_connector *connector,
+                               const struct drm_display_mode *fixed_mode);
 struct drm_display_mode *
 intel_panel_edid_fixed_mode(struct intel_connector *connector);
 struct drm_display_mode *

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 4727e74f743762fb3479f94f775138aed45bc293..47cd4a338db60bd754185461468206f23ba7eba6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -56,24 +56,16 @@ static bool is_downclock_mode(const struct drm_display_mode *downclock_mode,
                downclock_mode->clock < fixed_mode->clock;
 }
 
-/**
- * intel_find_panel_downclock - find the reduced downclock for LVDS in EDID
- * @dev_priv: i915 device instance
- * @fixed_mode : panel native mode
- * @connector: LVDS/eDP connector
- *
- * Return downclock_avail
- * Find the reduced downclock for LVDS/eDP in EDID.
- */
 struct drm_display_mode *
-intel_find_panel_downclock(struct drm_i915_private *dev_priv,
-                       struct drm_display_mode *fixed_mode,
-                       struct drm_connector *connector)
+intel_panel_edid_downclock_mode(struct intel_connector *connector,
+                               const struct drm_display_mode *fixed_mode)
 {
+       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
        const struct drm_display_mode *scan, *best_mode = NULL;
+       struct drm_display_mode *downclock_mode;
        int best_clock = fixed_mode->clock;
 
-       list_for_each_entry(scan, &connector->probed_modes, head) {
+       list_for_each_entry(scan, &connector->base.probed_modes, head) {
                /*
                 * If one mode has the same resolution with the fixed_panel
                 * mode while they have the different refresh rate, it means
@@ -92,10 +84,18 @@ intel_find_panel_downclock(struct drm_i915_private *dev_priv,
                }
        }
 
-       if (best_mode)
-               return drm_mode_duplicate(&dev_priv->drm, best_mode);
+       if (!best_mode)
+               return NULL;
+
+       downclock_mode = drm_mode_duplicate(&dev_priv->drm, best_mode);
+       if (!downclock_mode)
+               return NULL;
+
+       DRM_DEBUG_KMS("[CONNECTOR:%d:%s] using downclock mode from EDID: ",
+                     connector->base.base.id, connector->base.name);
+       drm_mode_debug_printmodeline(downclock_mode);
 
-       return NULL;
+       return downclock_mode;
 }
 
 struct drm_display_mode *