Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 813a7878 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm: Reduce EDID warnings from DRM_ERROR to DRM_NOTE 



The warnings from parsing the EDID are not driver errors, but the
"normal but significant" conditions from the external device. As such,
they do not need the ferocity of an *ERROR*, but can use the less harsh
DRM_NOTE instead.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170210195913.9878-1-chris@chris-wilson.co.uk
parent 6ac7c548

drivers/gpu/drm/drm_edid.c

+8 −7
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, 
			DRM_DEBUG("Assuming a KVM switch modified the CEA block but left the original checksum\n");

		} else {

			if (print_bad_edid)

				DRM_ERROR("EDID checksum is invalid, remainder is %d\n", csum);

				DRM_NOTE("EDID checksum is invalid, remainder is %d\n", csum);



			goto bad;

		}
@@ -1150,7 +1150,7 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, 
	switch (raw_edid[0]) {

	case 0: /* base */

		if (edid->version != 1) {

			DRM_ERROR("EDID has major version %d, instead of 1\n", edid->version);

			DRM_NOTE("EDID has major version %d, instead of 1\n", edid->version);

			goto bad;

		}
@@ -1167,10 +1167,11 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, 
bad:

	if (print_bad_edid) {

		if (drm_edid_is_zero(raw_edid, EDID_LENGTH)) {

			printk(KERN_ERR "EDID block is all zeroes\n");

			printk(KERN_NOTICE "EDID block is all zeroes\n");

		} else {

			printk(KERN_ERR "Raw EDID:\n");

			print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1,

			printk(KERN_NOTICE "Raw EDID:\n");

			print_hex_dump(KERN_NOTICE,

				       " \t", DUMP_PREFIX_NONE, 16, 1,

				       raw_edid, EDID_LENGTH, false);

		}

	}
@@ -4002,7 +4003,7 @@ static int validate_displayid(u8 *displayid, int length, int idx) 
		csum += displayid[i];

	}

	if (csum) {

		DRM_ERROR("DisplayID checksum invalid, remainder is %d\n", csum);

		DRM_NOTE("DisplayID checksum invalid, remainder is %d\n", csum);

		return -EINVAL;

	}

	return 0;