Attachment 37256 Details for Bug 28479 – [Patch]: add the support of setting other modes for eDP

[patch] [Patch]: add the support of setting other modes for eDP

0001-drm-i915-Add-the-support-of-setting-other-modes-for.patch (text/plain), 4.26 KB, created by ykzhao on 2010-07-20 19:03:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ykzhao

Created: 2010-07-20 19:03:52 UTC

Size: 4.26 KB

patch

obsolete

>From fb7107347b9d6076d0e212fe730c7cadfe1400a7 Mon Sep 17 00:00:00 2001
>From: Zhao Yakui <yakui.zhao@intel.com>
>Date: Wed, 21 Jul 2010 09:42:07 +0800
>Subject: [PATCH] drm/i915: Add the support of setting other modes for eDP
>
>Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
>---
> drivers/gpu/drm/i915/intel_display.c |    2 +-
> drivers/gpu/drm/i915/intel_dp.c      |   54 +++++++++++++++++++++++++++++++++-
> 2 files changed, 54 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 68dcf36..f1bd7d1 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -1828,7 +1828,7 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
> 		}
> 
> 		/* Enable panel fitting for LVDS */
>-		if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
>+		if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) || HAS_eDP) {
> 			temp = I915_READ(pf_ctl_reg);
> 			I915_WRITE(pf_ctl_reg, temp | PF_ENABLE | PF_FILTER_MED_3x3);
> 
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 1aac59e..2730d42 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -150,6 +150,18 @@ intel_dp_mode_valid(struct drm_connector *connector,
> 	int max_link_clock = intel_dp_link_clock(intel_dp_max_link_bw(intel_encoder));
> 	int max_lanes = intel_dp_max_lane_count(intel_encoder);
> 
>+	struct intel_dp_priv *dp_priv = intel_encoder->dev_priv;
>+	struct drm_device *dev = connector->dev;
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+
>+	if (IS_eDP(intel_encoder) && dev_priv->panel_fixed_mode) {
>+
>+		if (mode->hdisplay > dev_priv->panel_fixed_mode->hdisplay)
>+			return MODE_PANEL;
>+		if (mode->vdisplay > dev_priv->panel_fixed_mode->vdisplay)
>+			return MODE_PANEL;
>+	}
>+
> 	/* only refuse the mode on non eDP since we have seen some wierd eDP panels
> 	   which are outside spec tolerances but somehow work by magic */
> 	if (!IS_eDP(intel_encoder) &&
>@@ -509,10 +521,36 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
> 	struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
> 	struct intel_dp_priv   *dp_priv = intel_encoder->dev_priv;
> 	int lane_count, clock;
>+	struct drm_device *dev = encoder->dev;
>+	struct drm_i915_private *dev_priv = dev->dev_private;
> 	int max_lane_count = intel_dp_max_lane_count(intel_encoder);
> 	int max_clock = intel_dp_max_link_bw(intel_encoder) == DP_LINK_BW_2_7 ? 1 : 0;
> 	static int bws[2] = { DP_LINK_BW_1_62, DP_LINK_BW_2_7 };
> 
>+
>+	if (IS_eDP(intel_encoder) && dev_priv->panel_fixed_mode) {
>+		adjusted_mode->hdisplay = dev_priv->panel_fixed_mode->hdisplay;
>+		adjusted_mode->hsync_start =
>+			dev_priv->panel_fixed_mode->hsync_start;
>+		adjusted_mode->hsync_end =
>+			dev_priv->panel_fixed_mode->hsync_end;
>+		adjusted_mode->htotal = dev_priv->panel_fixed_mode->htotal;
>+		adjusted_mode->vdisplay = dev_priv->panel_fixed_mode->vdisplay;
>+		adjusted_mode->vsync_start =
>+			dev_priv->panel_fixed_mode->vsync_start;
>+		adjusted_mode->vsync_end =
>+			dev_priv->panel_fixed_mode->vsync_end;
>+		adjusted_mode->vtotal = dev_priv->panel_fixed_mode->vtotal;
>+		adjusted_mode->clock = dev_priv->panel_fixed_mode->clock;
>+		drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
>+
>+		/*
>+		 * the mode->clock is used to calculate the Data&Link M/N
>+		 * of the pipe. For the eDP the fixed clock should be used.
>+		 */
>+		mode->clock = dev_priv->panel_fixed_mode->clock;
>+	}
>+
> 	for (lane_count = 1; lane_count <= max_lane_count; lane_count <<= 1) {
> 		for (clock = 0; clock <= max_clock; clock++) {
> 			int link_avail = intel_dp_max_data_rate(intel_dp_link_clock(bws[clock]), lane_count);
>@@ -1297,8 +1335,22 @@ static int intel_dp_get_modes(struct drm_connector *connector)
> 	 */
> 
> 	ret = intel_ddc_get_modes(connector, intel_encoder->ddc_bus);
>-	if (ret)
>+
>+	if (ret) {
>+		if (IS_eDP(intel_encoder) && !dev_priv->panel_fixed_mode) {
>+			struct drm_display_mode *newmode;
>+			list_for_each_entry(newmode, &connector->probed_modes,
>+							head) {
>+				if (newmode->type & DRM_MODE_TYPE_PREFERRED) {
>+					dev_priv->panel_fixed_mode =
>+					drm_mode_duplicate(dev, newmode);
>+					break;
>+				}
>+			}
>+		}
>+
> 		return ret;
>+	}
> 
> 	/* if eDP has no EDID, try to use fixed panel mode from VBT */
> 	if (IS_eDP(intel_encoder)) {
>-- 
>1.5.4.5
>

Actions: View | Splinter Review

Attachments on bug 28479: 36190 | 36191 | 36192 | 36193 | 36699 | 36787 | 37105 | 37106 | 37107 | 37108 | 37230 | 37231 | 37232 | 37236 | 37256

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.