[PATCH] xfree86: use the DDC size if either width or height of DisplaySize is bogus.

[Dave Airlie]

On Mon, 2009-09-28 at 14:08 +1000, Peter Hutterer wrote:
> If either width or height of DisplaySize is invalid, assume that the
> configuration is invalid and use the DDC-reported values instead.
> 
> See Comment 9, Bug 9758.
> http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

Makes sense to me.

Acked-by: Dave Airlie <airlied at redhat.com>
> ---

> Second fix to 1.7 blocker-bug 9758.
> 
>  hw/xfree86/modes/xf86EdidModes.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
> index 6e11f9a..2f80070 100644
> --- a/hw/xfree86/modes/xf86EdidModes.c
> +++ b/hw/xfree86/modes/xf86EdidModes.c
> @@ -957,7 +957,7 @@ xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
>  
>      quirks = xf86DDCDetectQuirks(scrnIndex, DDC, FALSE);
>  
> -    if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) {
> +    if (Monitor->widthmm <= 0 || Monitor->heightmm <= 0) {
>  	Monitor->widthmm = 10 * DDC->features.hsize;
>  	Monitor->heightmm = 10 * DDC->features.vsize;
>      }