Attachment 143554 Details for Bug 109780 – [PATCH 1/2] drm/i915: Refactor EDID fixed mode search

[patch] [PATCH 1/2] drm/i915: Refactor EDID fixed mode search

0001-drm-i915-Refactor-EDID-fixed-mode-search.patch (text/plain), 4.87 KB, created by Ville Syrjala on 2019-03-06 18:21:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2019-03-06 18:21:21 UTC

Size: 4.87 KB

patch

obsolete

>From 3e779d369caa1c102dbed4606b124589c8fc515e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Tue, 7 Feb 2017 11:52:08 +0200
>Subject: [PATCH 1/2] drm/i915: Refactor EDID fixed mode search
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Both LVDS and eDP have the same code to look up the preferred mode
>from the connector probed_modes list. Move the code to a common
>location.
>
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/intel_dp.c    | 13 +++----------
> drivers/gpu/drm/i915/intel_drv.h   |  2 ++
> drivers/gpu/drm/i915/intel_lvds.c  | 14 +++-----------
> drivers/gpu/drm/i915/intel_panel.c | 27 +++++++++++++++++++++++++++
> 4 files changed, 35 insertions(+), 21 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index e1a051c0fbfe..d3025be11bab 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -7066,7 +7066,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> 	struct drm_display_mode *fixed_mode = NULL;
> 	struct drm_display_mode *downclock_mode = NULL;
> 	bool has_dpcd;
>-	struct drm_display_mode *scan;
> 	enum pipe pipe = INVALID_PIPE;
> 	intel_wakeref_t wakeref;
> 	struct edid *edid;
>@@ -7119,15 +7118,9 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> 	}
> 	intel_connector->edid = edid;
> 
>-	/* prefer fixed mode from EDID if available */
>-	list_for_each_entry(scan, &connector->probed_modes, head) {
>-		if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {
>-			fixed_mode = drm_mode_duplicate(dev, scan);
>-			downclock_mode = intel_dp_drrs_init(
>-						intel_connector, fixed_mode);
>-			break;
>-		}
>-	}
>+	fixed_mode = intel_panel_edid_fixed_mode(intel_connector);
>+	if (fixed_mode)
>+		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) {
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 5412373e2f98..49424e1646a2 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -2152,6 +2152,8 @@ 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_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 b4aa49768e90..d2b5ce96f1f9 100644
>--- a/drivers/gpu/drm/i915/intel_lvds.c
>+++ b/drivers/gpu/drm/i915/intel_lvds.c
>@@ -813,7 +813,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> 	struct intel_connector *intel_connector;
> 	struct drm_connector *connector;
> 	struct drm_encoder *encoder;
>-	struct drm_display_mode *scan; /* *modes, *bios_mode; */
> 	struct drm_display_mode *fixed_mode = NULL;
> 	struct drm_display_mode *downclock_mode = NULL;
> 	struct edid *edid;
>@@ -952,16 +951,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> 	}
> 	intel_connector->edid = edid;
> 
>-	list_for_each_entry(scan, &connector->probed_modes, head) {
>-		if (scan->type & DRM_MODE_TYPE_PREFERRED) {
>-			DRM_DEBUG_KMS("using preferred mode from EDID: ");
>-			drm_mode_debug_printmodeline(scan);
>-
>-			fixed_mode = drm_mode_duplicate(dev, scan);
>-			if (fixed_mode)
>-				goto out;
>-		}
>-	}
>+	fixed_mode = intel_panel_edid_fixed_mode(intel_connector);
>+	if (fixed_mode)
>+		goto out;
> 
> 	/* Failed to get EDID, what about VBT? */
> 	if (dev_priv->vbt.lfp_lvds_vbt_mode) {
>diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
>index beca98d2b035..90d9ac8a8cec 100644
>--- a/drivers/gpu/drm/i915/intel_panel.c
>+++ b/drivers/gpu/drm/i915/intel_panel.c
>@@ -99,6 +99,33 @@ intel_find_panel_downclock(struct drm_i915_private *dev_priv,
> 		return NULL;
> }
> 
>+struct drm_display_mode *
>+intel_panel_edid_fixed_mode(struct intel_connector *connector)
>+{
>+	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>+	const struct drm_display_mode *scan;
>+
>+	/* prefer fixed mode from EDID if available */
>+	list_for_each_entry(scan, &connector->base.probed_modes, head) {
>+		struct drm_display_mode *fixed_mode;
>+
>+		if ((scan->type & DRM_MODE_TYPE_PREFERRED) == 0)
>+			continue;
>+
>+		fixed_mode = drm_mode_duplicate(&dev_priv->drm, scan);
>+		if (!fixed_mode)
>+			return NULL;
>+
>+		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] using preferred mode from EDID: ",
>+			      connector->base.base.id, connector->base.name);
>+		drm_mode_debug_printmodeline(fixed_mode);
>+
>+		return fixed_mode;
>+	}
>+
>+	return NULL;
>+}
>+
> /* adjusted_mode has been preset to be the panel's fixed mode */
> void
> intel_pch_panel_fitting(struct intel_crtc *intel_crtc,
>-- 
>2.19.2
>

Actions: View | Splinter Review

Attachments on bug 109780: 143458 | 143460 | 143461 | 143471 | 143472 | 143473 | 143477 | 143486 | 143487 | 143488 | 143490 | 143554 | 143555 | 143563

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.