aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-01-29 08:27:39 -0500
committerDave Airlie <airlied@redhat.com>2013-02-14 19:20:34 -0500
commitf934ec8c34b9dcefb5a4f35b0bda33bca289cbe6 (patch)
treee46e6549c4b2e5a8d345dfcfa7f0353c7c1b59fa
parent3e2b756ba330343c960c332695608b9c5881a173 (diff)
drm: shut up invalid edid messages
My cheapo monitor has an invalid block 1, resulting in a lot of dmesg spam every few seconds. I get it the first time that the entire block is all 0xff.. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: stable@vger.kernel.org [v3.7] Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_edid.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 51324256a657..e1aca7b53987 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -354,10 +354,14 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
354 break; 354 break;
355 } 355 }
356 } 356 }
357 if (i == 4) 357
358 if (i == 4 && print_bad_edid) {
358 dev_warn(connector->dev->dev, 359 dev_warn(connector->dev->dev,
359 "%s: Ignoring invalid EDID block %d.\n", 360 "%s: Ignoring invalid EDID block %d.\n",
360 drm_get_connector_name(connector), j); 361 drm_get_connector_name(connector), j);
362
363 connector->bad_edid_counter++;
364 }
361 } 365 }
362 366
363 if (valid_extensions != block[0x7e]) { 367 if (valid_extensions != block[0x7e]) {