All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [PATCH 09/12] drm/edid: convert extension block read to EDID block read helper
Date: Thu,  7 Apr 2022 12:14:35 +0300	[thread overview]
Message-ID: <464387f15ebcba39e424a7e15bbf59f0c1ba1717.1649322799.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1649322799.git.jani.nikula@intel.com>

Use the EDID block read helper also for extension block reads, making
edid_block_read() the only place with the read retry logic.

Note: We observe that drm_do_get_edid() does not use invalid extension
blocks to flag the EDID as corrupt.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index bffb8a599cda..6fa17084af02 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2143,17 +2143,16 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
 
 	for (j = 1; j <= edid->extensions; j++) {
 		void *block = edid + j;
-		int try;
 
-		for (try = 0; try < 4; try++) {
-			if (read_block(context, block, j, EDID_LENGTH))
-				goto out;
-			if (drm_edid_block_valid(block, j, false, NULL))
-				break;
-		}
+		status = edid_block_read(block, j, read_block, context);
 
-		if (try == 4)
+		edid_block_status_print(status, block, j);
+
+		if (!edid_block_status_valid(status, edid_block_tag(block))) {
+			if (status == EDID_BLOCK_READ_FAIL)
+				goto out;
 			invalid_blocks++;
+		}
 	}
 
 	if (invalid_blocks) {
-- 
2.30.2


WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 09/12] drm/edid: convert extension block read to EDID block read helper
Date: Thu,  7 Apr 2022 12:14:35 +0300	[thread overview]
Message-ID: <464387f15ebcba39e424a7e15bbf59f0c1ba1717.1649322799.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1649322799.git.jani.nikula@intel.com>

Use the EDID block read helper also for extension block reads, making
edid_block_read() the only place with the read retry logic.

Note: We observe that drm_do_get_edid() does not use invalid extension
blocks to flag the EDID as corrupt.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index bffb8a599cda..6fa17084af02 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2143,17 +2143,16 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
 
 	for (j = 1; j <= edid->extensions; j++) {
 		void *block = edid + j;
-		int try;
 
-		for (try = 0; try < 4; try++) {
-			if (read_block(context, block, j, EDID_LENGTH))
-				goto out;
-			if (drm_edid_block_valid(block, j, false, NULL))
-				break;
-		}
+		status = edid_block_read(block, j, read_block, context);
 
-		if (try == 4)
+		edid_block_status_print(status, block, j);
+
+		if (!edid_block_status_valid(status, edid_block_tag(block))) {
+			if (status == EDID_BLOCK_READ_FAIL)
+				goto out;
 			invalid_blocks++;
+		}
 	}
 
 	if (invalid_blocks) {
-- 
2.30.2


  parent reply	other threads:[~2022-04-07  9:15 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-07  9:14 [PATCH 00/12] drm/edid: low level EDID block read refactoring etc Jani Nikula
2022-04-07  9:14 ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 01/12] drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 02/12] drm/edid: have edid_block_check() detect blocks that are all zero Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 03/12] drm/edid: refactor EDID block status printing Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07 11:54   ` Ville Syrjälä
2022-04-07 11:54     ` [Intel-gfx] " Ville Syrjälä
2022-04-11  9:49     ` Jani Nikula
2022-04-11  9:49       ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 04/12] drm/edid: add a helper to log dump an EDID block Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 05/12] drm/edid: pass struct edid to connector_bad_edid() Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07 11:56   ` Ville Syrjälä
2022-04-07 11:56     ` [Intel-gfx] " Ville Syrjälä
2022-04-07  9:14 ` [PATCH 06/12] drm/edid: add typedef for block read function Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07 12:06   ` Ville Syrjälä
2022-04-07 12:06     ` [Intel-gfx] " Ville Syrjälä
2022-04-11  9:48     ` Jani Nikula
2022-04-11  9:48       ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 07/12] drm/edid: abstract an EDID block read helper Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 08/12] drm/edid: use EDID block read helper in drm_do_get_edid() Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` Jani Nikula [this message]
2022-04-07  9:14   ` [Intel-gfx] [PATCH 09/12] drm/edid: convert extension block read to EDID block read helper Jani Nikula
2022-04-07  9:14 ` [PATCH 10/12] drm/edid: drop extra local var Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 11/12] drm/edid: add single point of return to drm_do_get_edid() Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07  9:14 ` [PATCH 12/12] drm/edid: add EDID block count and size helpers Jani Nikula
2022-04-07  9:14   ` [Intel-gfx] " Jani Nikula
2022-04-07 15:07   ` [PATCH v2] " Jani Nikula
2022-04-07 15:07     ` [Intel-gfx] " Jani Nikula
2022-04-07 12:24 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/edid: low level EDID block read refactoring etc Patchwork
2022-04-07 12:41   ` Jani Nikula
2022-04-07 12:44 ` [PATCH 00/12] " Ville Syrjälä
2022-04-07 12:44   ` [Intel-gfx] " Ville Syrjälä
2022-04-11  9:51   ` Jani Nikula
2022-04-11  9:51     ` [Intel-gfx] " Jani Nikula
2022-04-07 17:43 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: low level EDID block read refactoring etc. (rev2) Patchwork
2022-04-07 23:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: low level EDID block read refactoring etc. (rev3) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=464387f15ebcba39e424a7e15bbf59f0c1ba1717.1649322799.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.