Attachment 582808 Details for Bug 853350

[patch] Patch to improve the cmdline mode parser

0001-drm-Prefer-noninterlace-cmdline-mode-unless-explicit.patch (text/plain), 2.23 KB, created by Takashi Iwai on 2014-03-19 13:50:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2014-03-19 13:50:37 UTC

Size: 2.23 KB

patch

obsolete

>From ba9b0708da3c397dc740ef669191208bc6ac0a83 Mon Sep 17 00:00:00 2001
>From: Takashi Iwai <tiwai@suse.de>
>Date: Wed, 19 Mar 2014 14:40:33 +0100
>Subject: [PATCH] drm: Prefer noninterlace cmdline mode unless explicitly
> specified
>
>Currently drm_pick_cmdline_mode() doesn't care about the interlace
>when the given mode line has no "i" suffix.  That is, when there are
>multiple entries for the same resolution, an interlace mode might be
>picked up just depending on the assigned order, and there is no way to
>exclude it.
>
>This patch changes the logic for the mode selection, to prefer the
>noninterlace mode unless the interlace mode is explicitly given.
>When no matching mode is found, it still tries the interlace mode as
>fallback.
>
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>---
> drivers/gpu/drm/drm_fb_helper.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
>diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
>index 98a03639b413..0a4b0a24359f 100644
>--- a/drivers/gpu/drm/drm_fb_helper.c
>+++ b/drivers/gpu/drm/drm_fb_helper.c
>@@ -1162,6 +1162,7 @@ static struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_conne
> {
> 	struct drm_cmdline_mode *cmdline_mode;
> 	struct drm_display_mode *mode = NULL;
>+	bool prefer_non_interlace;
> 
> 	cmdline_mode = &fb_helper_conn->cmdline_mode;
> 	if (cmdline_mode->specified == false)
>@@ -1173,6 +1174,8 @@ static struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_conne
> 	if (cmdline_mode->rb || cmdline_mode->margins)
> 		goto create_mode;
> 
>+	prefer_non_interlace = !cmdline_mode->interlace;
>+ again:
> 	list_for_each_entry(mode, &fb_helper_conn->connector->modes, head) {
> 		/* check width/height */
> 		if (mode->hdisplay != cmdline_mode->xres ||
>@@ -1187,10 +1190,18 @@ static struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_conne
> 		if (cmdline_mode->interlace) {
> 			if (!(mode->flags & DRM_MODE_FLAG_INTERLACE))
> 				continue;
>+		} else if (prefer_non_interlace) {
>+			if (mode->flags & DRM_MODE_FLAG_INTERLACE)
>+				continue;
> 		}
> 		return mode;
> 	}
> 
>+	if (prefer_non_interlace) {
>+		prefer_non_interlace = false;
>+		goto again;
>+	}
>+
> create_mode:
> 	mode = drm_mode_create_from_cmdline_mode(fb_helper_conn->connector->dev,
> 						 cmdline_mode);
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 853350: 570405 | 572306 | 572319 | 582638 | 582641 | 582645 | 582748 | 582753 | 582808