[PATCH] drm/edid: Do dmt_modes_for_range less aggressively

[PATCH] drm/edid: Do dmt_modes_for_range less aggressively

[Adam Jackson]

Only fill it in for pre-1.1 monitors - when GTF hadn't yet been defined
- or for EDID 1.4's explicit "just a range, not a timing formula" case.

Bugzilla: https://bugs.freedesktop.org/51146
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 drivers/gpu/drm/drm_edid.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index eb92fe2..062dd06 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1138,12 +1138,12 @@ do_inferred_modes(struct detailed_timing *timing, void *c)
 	if (data->type != EDID_DETAIL_MONITOR_RANGE)
 		return;
 
-	closure->modes += drm_dmt_modes_for_range(closure->connector,
-						  closure->edid,
-						  timing);
-	
-	if (!version_greater(closure->edid, 1, 1))
+	if (!version_greater(closure->edid, 1, 1)) {
+		closure->modes += drm_dmt_modes_for_range(closure->connector,
+							  closure->edid,
+							  timing);
 		return; /* GTF not defined yet */
+	}
 
 	switch (range->flags) {
 	case 0x02: /* secondary gtf, XXX could do more */
@@ -1161,6 +1161,10 @@ do_inferred_modes(struct detailed_timing *timing, void *c)
 							  timing);
 		break;
 	case 0x01: /* just the ranges, no formula */
+		closure->modes += drm_dmt_modes_for_range(closure->connector,
+							  closure->edid,
+							  timing);
+		break;
 	default:
 		break;
 	}
-- 
1.7.7.6

Re: [PATCH] drm/edid: Do dmt_modes_for_range less aggressively

[Adam Jackson]

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

On Tue, 2012-06-19 at 14:55 -0400, Adam Jackson wrote:
> Only fill it in for pre-1.1 monitors - when GTF hadn't yet been defined
> - or for EDID 1.4's explicit "just a range, not a timing formula" case.
> 
> Bugzilla: https://bugs.freedesktop.org/51146
> Signed-off-by: Adam Jackson <ajax@redhat.com>

Self-nak, at any rate hold off from doing this for the moment.  The bz
above is turning out more subtle than I was expecting.

I'm really not a fan of how the extra_modes changes introduced new
failure cases despite my best efforts to be conservative.  Wish I'd said
no harder.

- ajax

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel