drm/edid: Ignore bad standard timings.
Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
committed by
Dave Airlie
parent
083ae0560a
commit
23425caeeb
@@ -502,6 +502,19 @@ static struct drm_display_mode *drm_find_dmt(struct drm_device *dev,
|
|||||||
}
|
}
|
||||||
return mode;
|
return mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 0 is reserved. The spec says 0x01 fill for unused timings. Some old
|
||||||
|
* monitors fill with ascii space (0x20) instead.
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
bad_std_timing(u8 a, u8 b)
|
||||||
|
{
|
||||||
|
return (a == 0x00 && b == 0x00) ||
|
||||||
|
(a == 0x01 && b == 0x01) ||
|
||||||
|
(a == 0x20 && b == 0x20);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* drm_mode_std - convert standard mode info (width, height, refresh) into mode
|
* drm_mode_std - convert standard mode info (width, height, refresh) into mode
|
||||||
* @t: standard timing params
|
* @t: standard timing params
|
||||||
@@ -525,6 +538,9 @@ struct drm_display_mode *drm_mode_std(struct drm_device *dev,
|
|||||||
unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
|
unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
|
||||||
>> EDID_TIMING_VFREQ_SHIFT;
|
>> EDID_TIMING_VFREQ_SHIFT;
|
||||||
|
|
||||||
|
if (bad_std_timing(t->hsize, t->vfreq_aspect))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
/* According to the EDID spec, the hdisplay = hsize * 8 + 248 */
|
/* According to the EDID spec, the hdisplay = hsize * 8 + 248 */
|
||||||
hsize = t->hsize * 8 + 248;
|
hsize = t->hsize * 8 + 248;
|
||||||
/* vrefresh_rate = vfreq + 60 */
|
/* vrefresh_rate = vfreq + 60 */
|
||||||
|
Reference in New Issue
Block a user