Bug 28479 -- black screen for non-native modes on eDP

Bug 28479 -- black screen for non-native modes on eDP

[Chris Wilson]

Yakui verified that these patches fix the issue reported in

  Bug 28479 - Black screen after using 1024x768 that manually added by xrandr.
  https://bugs.freedesktop.org/show_bug.cgi?id=28479

and then went off to enjoy his vacation.

The patches look sane in that they duplicate the panel handling similar to
the other encoder types. However, we are ending up with lots of
duplicated code and repeating mistakes. Is there any way we can begin to
refactor the fixed mode panel logic?
-Chris

[PATCH 1/4] drm/i915: Add fixed panel mode parsed from EDID for eDP without fixed mode in VBT

[Chris Wilson]

From: Zhao Yakui <yakui.zhao@intel.com>

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
---
 drivers/gpu/drm/i915/intel_dp.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b4f0282..74d026c 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1325,8 +1325,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) || IS_PCH_eDP(dp_priv)) &&
+		    !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) || IS_PCH_eDP(dp_priv)) {
-- 
1.7.1

[PATCH 2/4] drm/i915: Enable panel fitting for eDP

[Chris Wilson]

From: Zhao Yakui <yakui.zhao@intel.com>

When trying to set other display mode besides the fixed panel mode, the
panel fitting should be enabled. This is similar to LVDS.

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
---
 drivers/gpu/drm/i915/intel_display.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8359c50..77ae44e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1888,7 +1888,8 @@ 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 || intel_pch_has_edp(crtc)) {
 			temp = I915_READ(pf_ctl_reg);
 			I915_WRITE(pf_ctl_reg, temp | PF_ENABLE | PF_FILTER_MED_3x3);
 
-- 
1.7.1

[PATCH 3/4] drm/i915: Always use the fixed panel timing for eDP

[Chris Wilson]

From: Zhao Yakui <yakui.zhao@intel.com>

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
---
 drivers/gpu/drm/i915/intel_dp.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 74d026c..25168fa 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -511,11 +511,37 @@ 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;
+	struct drm_device *dev = encoder->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	int lane_count, clock;
 	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) || IS_PCH_eDP(dp_priv)) &&
+	    dev_priv->panel_fixed_mode) {
+		struct drm_display_mode *fixed_mode = dev_priv->panel_fixed_mode;
+
+		adjusted_mode->hdisplay = fixed_mode->hdisplay;
+		adjusted_mode->hsync_start = fixed_mode->hsync_start;
+		adjusted_mode->hsync_end = fixed_mode->hsync_end;
+		adjusted_mode->htotal = fixed_mode->htotal;
+
+		adjusted_mode->vdisplay = fixed_mode->vdisplay;
+		adjusted_mode->vsync_start = fixed_mode->vsync_start;
+		adjusted_mode->vsync_end = fixed_mode->vsync_end;
+		adjusted_mode->vtotal = fixed_mode->vtotal;
+
+		adjusted_mode->clock = 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);
-- 
1.7.1

[PATCH 4/4] drm/i915: Validate the mode for eDP by using fixed panel size

[Chris Wilson]

From: Zhao Yakui <yakui.zhao@intel.com>

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
---
 drivers/gpu/drm/i915/intel_dp.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 25168fa..6f4afde 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -150,9 +150,21 @@ intel_dp_mode_valid(struct drm_connector *connector,
 {
 	struct drm_encoder *encoder = intel_attached_encoder(connector);
 	struct intel_encoder *intel_encoder = enc_to_intel_encoder(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;
 	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);
 
+	if ((IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) &&
+	    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) &&
-- 
1.7.1

Re: [PATCH 2/4] drm/i915: Enable panel fitting for eDP

[Dave Airlie]

did this patch go anywhere?

On Mon, Jul 19, 2010 at 6:43 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> From: Zhao Yakui <yakui.zhao@intel.com>
>
> When trying to set other display mode besides the fixed panel mode, the
> panel fitting should be enabled. This is similar to LVDS.
>
> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org
> ---
>  drivers/gpu/drm/i915/intel_display.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8359c50..77ae44e 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1888,7 +1888,8 @@ 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 || intel_pch_has_edp(crtc)) {
>                        temp = I915_READ(pf_ctl_reg);
>                        I915_WRITE(pf_ctl_reg, temp | PF_ENABLE | PF_FILTER_MED_3x3);
>
> --
> 1.7.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>

Re: [PATCH 1/4] drm/i915: Add fixed panel mode parsed from EDID for eDP without fixed mode in VBT

[Dave Airlie]

Or any of this series? I'm not seeing them upstream, and I'd really
like to know if they are necessary.

Dave.

On Mon, Jul 19, 2010 at 6:43 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> From: Zhao Yakui <yakui.zhao@intel.com>
>
> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org
> ---
>  drivers/gpu/drm/i915/intel_dp.c |   16 +++++++++++++++-
>  1 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index b4f0282..74d026c 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1325,8 +1325,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) || IS_PCH_eDP(dp_priv)) &&
> +                   !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) || IS_PCH_eDP(dp_priv)) {
> --
> 1.7.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>

Re: [PATCH 1/4] drm/i915: Add fixed panel mode parsed from EDID for eDP without fixed mode in VBT

[Zhenyu Wang]

[-- Attachment #1.1: Type: text/plain, Size: 405 bytes --]

On 2010.07.29 11:00:03 +1000, Dave Airlie wrote:
> Or any of this series? I'm not seeing them upstream, and I'd really
> like to know if they are necessary.
> 

It does like what for LVDS to set non panel fixed mode. I reviewed
them too, or Chris might want to clean up fixed mode handling?

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/4] drm/i915: Enable panel fitting for eDP

[Chris Wilson]

On Thu, 29 Jul 2010 10:58:53 +1000, Dave Airlie <airlied@gmail.com> wrote:
> did this patch go anywhere?

We haven't forgotten it. It has been successfully tested by the bug
reporter to have fixed the issue on his machine. When Eric did his last
sweep of patches for Linus, we realised that it was based on
drm-intel-next and so not ready to be pushed.
-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH 3/4] drm/i915: Always use the fixed panel timing for eDP

[Eric Anholt]

[-- Attachment #1.1: Type: text/plain, Size: 320 bytes --]

On Mon, 19 Jul 2010 09:43:13 +0100, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> From: Zhao Yakui <yakui.zhao@intel.com>
> 
> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org

Chris, thanks for reviewing this!  Applied to -next.

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [stable] [PATCH 2/4] drm/i915: Enable panel fitting for eDP

[Greg KH]

On Thu, Jul 29, 2010 at 10:58:53AM +1000, Dave Airlie wrote:
> did this patch go anywhere?

It's now upstream in Linus's tree.

thanks,

greg k-h

> On Mon, Jul 19, 2010 at 6:43 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > From: Zhao Yakui <yakui.zhao@intel.com>
> >
> > When trying to set other display mode besides the fixed panel mode, the
> > panel fitting should be enabled. This is similar to LVDS.
> >
> > Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: stable@kernel.org
> > ---
> >  drivers/gpu/drm/i915/intel_display.c |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 8359c50..77ae44e 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -1888,7 +1888,8 @@ 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 || intel_pch_has_edp(crtc)) {
> >                        temp = I915_READ(pf_ctl_reg);
> >                        I915_WRITE(pf_ctl_reg, temp | PF_ENABLE | PF_FILTER_MED_3x3);
> >
> > --
> > 1.7.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> 
> _______________________________________________
> stable mailing list
> stable@linux.kernel.org
> http://linux.kernel.org/mailman/listinfo/stable