Attachment 16276 Details for Bug 15779 – 0001-fix-parsing-weird-EDID.patch

[patch] 0001-fix-parsing-weird-EDID.patch

0001-fix-parsing-weird-EDID.patch (text/plain), 5.76 KB, created by Paulo César Pereira de Andrade on 2008-04-30 15:25:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-04-30 15:25:57 UTC

Size: 5.76 KB

patch

obsolete

>From 81de886e281affd41ca813e735694ecd63744b69 Mon Sep 17 00:00:00 2001
>From: Pixel <pixel@mandriva.com>
>Date: Thu, 20 Sep 2007 16:08:30 -0300
>Subject: [PATCH] fix parsing weird EDID
>
>o fixes intel driver defaulting to smallest resolution (#31183)
>o take into account screen width when looking for prefered resolution
>  instead of only using screen height (helps choosing 1024x768 instead
>  of the weird 1152x768)
>---
> hw/xfree86/common/xf86str.h |    1 +
> hw/xfree86/ddc/edid.h       |    2 +-
> hw/xfree86/modes/xf86Crtc.c |   66 ++++++++++++++++++++++---------------------
> hw/xfree86/modes/xf86Crtc.h |    3 ++
> 4 files changed, 39 insertions(+), 33 deletions(-)
>
>diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
>index 086d2bf..31b6343 100644
>--- a/hw/xfree86/common/xf86str.h
>+++ b/hw/xfree86/common/xf86str.h
>@@ -132,6 +132,7 @@ typedef enum {
> # define M_T_DEFAULT 0x10	/* (VESA) default modes */
> # define M_T_USERDEF 0x20	/* One of the modes from the config file */
> # define M_T_DRIVER  0x40	/* Supplied by the driver (EDID, etc) */
>+# define M_T_USERPREF 0x80	/* mode preferred by the user config */
> 
> /* Video mode */
> typedef struct _DisplayModeRec {
>diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
>index 0b6a15a..8611988 100644
>--- a/hw/xfree86/ddc/edid.h
>+++ b/hw/xfree86/ddc/edid.h
>@@ -190,7 +190,7 @@
> 
> 
> /* EDID Ver. >= 1.2 */
>-#define _IS_MONITOR_DESC(x) (x[0] == 0 && x[1] == 0 && x[2] == 0 && x[4] == 0)
>+#define _IS_MONITOR_DESC(x) (x[0] == 0 && x[1] == 0 && x[2] == 0)
> #define IS_MONITOR_DESC _IS_MONITOR_DESC(c)
> #define _PIXEL_CLOCK(x) (x[0] + (x[1] << 8)) * 10000
> #define PIXEL_CLOCK _PIXEL_CLOCK(c)
>diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
>index d375da8..f75e9a4 100644
>--- a/hw/xfree86/modes/xf86Crtc.c
>+++ b/hw/xfree86/modes/xf86Crtc.c
>@@ -701,18 +701,23 @@ xf86DefaultMode (xf86OutputPtr output, int width, int height)
>     int		    target_diff = 0;
>     int		    target_preferred = 0;
>     int		    mm_height;
>+    int		    mm_width;
>     
>     mm_height = output->mm_height;
>+    mm_width = output->mm_width;
>     if (!mm_height)
> 	mm_height = 203;	/* 768 pixels at 96dpi */
>+    if (!mm_width)
>+	mm_width = 270;	/* 1024 pixels at 96dpi */
>     /*
>      * Pick a mode closest to 96dpi 
>      */
>     for (mode = output->probed_modes; mode; mode = mode->next)
>     {
> 	int	    dpi;
>-	int	    preferred = (mode->type & M_T_PREFERRED) != 0;
>-	int	    diff;
>+	int	    preferred = (((mode->type & M_T_PREFERRED) != 0) +
>+				 ((mode->type & M_T_USERPREF) != 0));
>+	int	    diff, diff2;
> 
> 	if (xf86ModeWidth (mode, output->initial_rotation) > width ||
> 	    xf86ModeHeight (mode, output->initial_rotation) > height)
>@@ -722,6 +727,11 @@ xf86DefaultMode (xf86OutputPtr output, int width, int height)
> 	dpi = (mode->VDisplay * 254) / (mm_height * 10);
> 	diff = dpi - 96;
> 	diff = diff < 0 ? -diff : diff;
>+
>+	dpi = (mode->HDisplay * 254) / (mm_width * 10);
>+	diff2 = dpi - 96;
>+	diff += diff2 < 0 ? -diff2 : diff2;
>+
> 	if (target_mode == NULL || (preferred > target_preferred) ||
> 	    (preferred == target_preferred && diff < target_diff))
> 	{
>@@ -1415,7 +1425,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
> 			mode->prev = NULL;
> 			output->probed_modes = mode;
> 		    }
>-		    mode->type |= M_T_PREFERRED;
>+		    mode->type |= (M_T_PREFERRED|M_T_USERPREF);
> 		}
> 		else
> 		    mode->type &= ~M_T_PREFERRED;
>@@ -1532,6 +1542,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
>     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
>     int			o, c;
>     DisplayModePtr	target_mode = NULL;
>+    int			target_preferred = 0;
>     Rotation		target_rotation = RR_Rotate_0;
>     xf86CrtcPtr		*crtcs;
>     DisplayModePtr	*modes;
>@@ -1572,43 +1583,34 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
>     }
>     
>     /*
>-     * Let outputs with preferred modes drive screen size
>+     * User preferred > preferred > other modes
>      */
>     for (o = 0; o < config->num_output; o++)
>     {
>-	xf86OutputPtr output = config->output[o];
>+	xf86OutputPtr	output = config->output[o];
>+	DisplayModePtr	default_mode;
>+	int		default_preferred;
> 
>-	if (enabled[o] &&
>-	    xf86OutputHasPreferredMode (output, width, height))
>+	if (!enabled[o])
>+	    continue;
>+	default_mode = xf86DefaultMode (output, width, height);
>+	if (!default_mode)
>+	    continue;
>+	default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) +
>+			     ((default_mode->type & M_T_USERPREF) != 0));
>+	if (default_preferred > target_preferred || !target_mode)
> 	{
>-	    target_mode = xf86DefaultMode (output, width, height);
>+	    target_mode = default_mode;
>+	    target_preferred = default_preferred;
> 	    target_rotation = output->initial_rotation;
>-	    if (target_mode)
>-	    {
>-		modes[o] = target_mode;
>-		config->compat_output = o;
>-		break;
>-	    }
>-	}
>-    }
>-    if (!target_mode)
>-    {
>-	for (o = 0; o < config->num_output; o++)
>-	{
>-	    xf86OutputPtr output = config->output[o];
>-	    if (enabled[o])
>-	    {
>-		target_mode = xf86DefaultMode (output, width, height);
>-		target_rotation = output->initial_rotation;
>-		if (target_mode)
>-		{
>-		    modes[o] = target_mode;
>-		    config->compat_output = o;
>-		    break;
>-		}
>-	    }
>+	    config->compat_output = o;
> 	}
>     }
>+    if (target_mode)
>+	modes[config->compat_output] = target_mode;
>+    /*
>+     * Fill in other output modes
>+     */
>     for (o = 0; o < config->num_output; o++)
>     {
> 	xf86OutputPtr output = config->output[o];
>diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
>index 9693e12..4c843cd 100644
>--- a/hw/xfree86/modes/xf86Crtc.h
>+++ b/hw/xfree86/modes/xf86Crtc.h
>@@ -39,6 +39,9 @@
> #ifndef M_T_DRIVER
> #define M_T_DRIVER	0x40
> #endif
>+#ifndef M_T_USERPREF
>+#define M_T_USERPREF	0x80
>+#endif
> #ifndef HARDWARE_CURSOR_ARGB
> #define HARDWARE_CURSOR_ARGB				0x00004000
> #endif
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 15779: 16276

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.