dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/edid: Don't print an error if the checksum of a CEA block is wrong
@ 2016-12-08 13:11 Tomeu Vizoso
  2017-02-08 13:19 ` Tahvanainen, Jari
  0 siblings, 1 reply; 3+ messages in thread
From: Tomeu Vizoso @ 2016-12-08 13:11 UTC (permalink / raw)
  To: linux-kernel
  Cc: Tomeu Vizoso, Tomi Sarvela, intel-gfx, David Airlie, dri-devel,
	Daniel Vetter

It's common to share screens within CI labs, and it's also common for
KVM switches to alter the contents of the CEA block but leave the
checksum outdated.

So in this case, print a debug message instead of an error.

References: https://bugs.freedesktop.org/show_bug.cgi?id=98228
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 drivers/gpu/drm/drm_edid.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 6798c3ad9d53..db79bc949216 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1128,16 +1128,19 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
 
 	csum = drm_edid_block_checksum(raw_edid);
 	if (csum) {
-		if (print_bad_edid) {
-			DRM_ERROR("EDID checksum is invalid, remainder is %d\n", csum);
-		}
-
 		if (edid_corrupt)
 			*edid_corrupt = true;
 
 		/* allow CEA to slide through, switches mangle this */
-		if (raw_edid[0] != 0x02)
+		if (raw_edid[0] == CEA_EXT) {
+			DRM_DEBUG("EDID checksum is invalid, remainder is %d\n", csum);
+			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);
+
 			goto bad;
+		}
 	}
 
 	/* per-block-type checks */
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: drm/edid: Don't print an error if the checksum of a CEA block is wrong
  2016-12-08 13:11 [PATCH] drm/edid: Don't print an error if the checksum of a CEA block is wrong Tomeu Vizoso
@ 2017-02-08 13:19 ` Tahvanainen, Jari
  2017-02-08 13:32   ` Daniel Vetter
  0 siblings, 1 reply; 3+ messages in thread
From: Tahvanainen, Jari @ 2017-02-08 13:19 UTC (permalink / raw)
  To: tomeu.vizoso@collabora.com, linux-kernel@vger.kernel.org
  Cc: Sarvela, Tomi P, David Airlie, intel-gfx@lists.freedesktop.org,
	dri-devel@lists.freedesktop.org, Vetter, Daniel

I applied this change on the couple-days old drm-tip, and was not able to get any "EDID checksum is invalid" messages with it on my SKL. Without this patch I could generate the ERROR quite easily by switching the outputs and displays manually.
I don't know if this hides something that it should not but it seem to work for the problem related the noise on Patchwork CI execution caused by these EDID checksum is invalid messages.

Tested-by: Jari Tahvanainen <jari.tahvanainen@intel.com>

-----Original Message-----
From: Tomeu Vizoso [mailto:tomeu.vizoso@collabora.com] 
Sent: Thursday, December 8, 2016 3:12 PM
To: linux-kernel@vger.kernel.org
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>; Tomi Sarvela <tomi.p.sarvela@intel.com>; intel-gfx@lists.freedesktop.org; David Airlie <airlied@linux.ie>; dri-devel@lists.freedesktop.org; Daniel Vetter <daniel.vetter@intel.com>
Subject: drm/edid: Don't print an error if the checksum of a CEA block is wrong

It's common to share screens within CI labs, and it's also common for KVM switches to alter the contents of the CEA block but leave the checksum outdated.

So in this case, print a debug message instead of an error.

References: https://bugs.freedesktop.org/show_bug.cgi?id=98228
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 drivers/gpu/drm/drm_edid.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 6798c3ad9d53..db79bc949216 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1128,16 +1128,19 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
 
 	csum = drm_edid_block_checksum(raw_edid);
 	if (csum) {
-		if (print_bad_edid) {
-			DRM_ERROR("EDID checksum is invalid, remainder is %d\n", csum);
-		}
-
 		if (edid_corrupt)
 			*edid_corrupt = true;
 
 		/* allow CEA to slide through, switches mangle this */
-		if (raw_edid[0] != 0x02)
+		if (raw_edid[0] == CEA_EXT) {
+			DRM_DEBUG("EDID checksum is invalid, remainder is %d\n", csum);
+			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);
+
 			goto bad;
+		}
 	}
 
 	/* per-block-type checks */
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: drm/edid: Don't print an error if the checksum of a CEA block is wrong
  2017-02-08 13:19 ` Tahvanainen, Jari
@ 2017-02-08 13:32   ` Daniel Vetter
  0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2017-02-08 13:32 UTC (permalink / raw)
  To: Tahvanainen, Jari
  Cc: tomeu.vizoso@collabora.com, Sarvela, Tomi P,
	intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org, David Airlie, Vetter, Daniel

On Wed, Feb 08, 2017 at 01:19:23PM +0000, Tahvanainen, Jari wrote:
> I applied this change on the couple-days old drm-tip, and was not able to get any "EDID checksum is invalid" messages with it on my SKL. Without this patch I could generate the ERROR quite easily by switching the outputs and displays manually.
> I don't know if this hides something that it should not but it seem to work for the problem related the noise on Patchwork CI execution caused by these EDID checksum is invalid messages.
> 
> Tested-by: Jari Tahvanainen <jari.tahvanainen@intel.com>
> 
> -----Original Message-----
> From: Tomeu Vizoso [mailto:tomeu.vizoso@collabora.com] 
> Sent: Thursday, December 8, 2016 3:12 PM
> To: linux-kernel@vger.kernel.org
> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>; Tomi Sarvela <tomi.p.sarvela@intel.com>; intel-gfx@lists.freedesktop.org; David Airlie <airlied@linux.ie>; dri-devel@lists.freedesktop.org; Daniel Vetter <daniel.vetter@intel.com>
> Subject: drm/edid: Don't print an error if the checksum of a CEA block is wrong
> 
> It's common to share screens within CI labs, and it's also common for KVM switches to alter the contents of the CEA block but leave the checksum outdated.
> 
> So in this case, print a debug message instead of an error.
> 
> References: https://bugs.freedesktop.org/show_bug.cgi?id=98228
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Applied to drm-misc, thanks.
-Daniel

> ---
>  drivers/gpu/drm/drm_edid.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 6798c3ad9d53..db79bc949216 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -1128,16 +1128,19 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
>  
>  	csum = drm_edid_block_checksum(raw_edid);
>  	if (csum) {
> -		if (print_bad_edid) {
> -			DRM_ERROR("EDID checksum is invalid, remainder is %d\n", csum);
> -		}
> -
>  		if (edid_corrupt)
>  			*edid_corrupt = true;
>  
>  		/* allow CEA to slide through, switches mangle this */
> -		if (raw_edid[0] != 0x02)
> +		if (raw_edid[0] == CEA_EXT) {
> +			DRM_DEBUG("EDID checksum is invalid, remainder is %d\n", csum);
> +			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);
> +
>  			goto bad;
> +		}
>  	}
>  
>  	/* per-block-type checks */
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-02-08 13:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-08 13:11 [PATCH] drm/edid: Don't print an error if the checksum of a CEA block is wrong Tomeu Vizoso
2017-02-08 13:19 ` Tahvanainen, Jari
2017-02-08 13:32   ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).