From: Jani Nikula <jani.nikula@intel.com> To: dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Subject: [CI v3 04/12] drm/edid: add a helper to log dump an EDID block Date: Mon, 11 Apr 2022 17:00:27 +0300 [thread overview] Message-ID: <b56f120a26f54b0defc43faa6d49e26f072d4d8f.1649685475.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1649685475.git.jani.nikula@intel.com> Unify debug log dumping. There's duplication in the error paths for EDID block validity checks, but this should be neglible. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/drm_edid.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 88e8f906a229..0b8098e34236 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1773,6 +1773,23 @@ static void edid_block_status_print(enum edid_block_status status, } } +static void edid_block_dump(const char *level, const void *block, int block_num) +{ + enum edid_block_status status; + char prefix[20]; + + status = edid_block_check(block, block_num == 0); + if (status == EDID_BLOCK_ZERO) + sprintf(prefix, "\t[%02x] ZERO ", block_num); + else if (!edid_block_status_valid(status, edid_block_tag(block))) + sprintf(prefix, "\t[%02x] BAD ", block_num); + else + sprintf(prefix, "\t[%02x] GOOD ", block_num); + + print_hex_dump(level, prefix, DUMP_PREFIX_NONE, 16, 1, + block, EDID_LENGTH, false); +} + /** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block @@ -1826,9 +1843,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, if (!valid && print_bad_edid && status != EDID_BLOCK_ZERO) { pr_notice("Raw EDID:\n"); - print_hex_dump(KERN_NOTICE, - " \t", DUMP_PREFIX_NONE, 16, 1, - block, EDID_LENGTH, false); + edid_block_dump(KERN_NOTICE, block, block_num); } return valid; @@ -1976,18 +1991,8 @@ static void connector_bad_edid(struct drm_connector *connector, drm_dbg_kms(connector->dev, "%s: EDID is invalid:\n", connector->name); for (i = 0; i < num_blocks; i++) { u8 *block = edid + i * EDID_LENGTH; - char prefix[20]; - - if (edid_block_is_zero(block)) - sprintf(prefix, "\t[%02x] ZERO ", i); - else if (!drm_edid_block_valid(block, i, false, NULL)) - sprintf(prefix, "\t[%02x] BAD ", i); - else - sprintf(prefix, "\t[%02x] GOOD ", i); - print_hex_dump(KERN_DEBUG, - prefix, DUMP_PREFIX_NONE, 16, 1, - block, EDID_LENGTH, false); + edid_block_dump(KERN_DEBUG, block, i); } } -- 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] [CI v3 04/12] drm/edid: add a helper to log dump an EDID block Date: Mon, 11 Apr 2022 17:00:27 +0300 [thread overview] Message-ID: <b56f120a26f54b0defc43faa6d49e26f072d4d8f.1649685475.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1649685475.git.jani.nikula@intel.com> Unify debug log dumping. There's duplication in the error paths for EDID block validity checks, but this should be neglible. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/drm_edid.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 88e8f906a229..0b8098e34236 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1773,6 +1773,23 @@ static void edid_block_status_print(enum edid_block_status status, } } +static void edid_block_dump(const char *level, const void *block, int block_num) +{ + enum edid_block_status status; + char prefix[20]; + + status = edid_block_check(block, block_num == 0); + if (status == EDID_BLOCK_ZERO) + sprintf(prefix, "\t[%02x] ZERO ", block_num); + else if (!edid_block_status_valid(status, edid_block_tag(block))) + sprintf(prefix, "\t[%02x] BAD ", block_num); + else + sprintf(prefix, "\t[%02x] GOOD ", block_num); + + print_hex_dump(level, prefix, DUMP_PREFIX_NONE, 16, 1, + block, EDID_LENGTH, false); +} + /** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block @@ -1826,9 +1843,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, if (!valid && print_bad_edid && status != EDID_BLOCK_ZERO) { pr_notice("Raw EDID:\n"); - print_hex_dump(KERN_NOTICE, - " \t", DUMP_PREFIX_NONE, 16, 1, - block, EDID_LENGTH, false); + edid_block_dump(KERN_NOTICE, block, block_num); } return valid; @@ -1976,18 +1991,8 @@ static void connector_bad_edid(struct drm_connector *connector, drm_dbg_kms(connector->dev, "%s: EDID is invalid:\n", connector->name); for (i = 0; i < num_blocks; i++) { u8 *block = edid + i * EDID_LENGTH; - char prefix[20]; - - if (edid_block_is_zero(block)) - sprintf(prefix, "\t[%02x] ZERO ", i); - else if (!drm_edid_block_valid(block, i, false, NULL)) - sprintf(prefix, "\t[%02x] BAD ", i); - else - sprintf(prefix, "\t[%02x] GOOD ", i); - print_hex_dump(KERN_DEBUG, - prefix, DUMP_PREFIX_NONE, 16, 1, - block, EDID_LENGTH, false); + edid_block_dump(KERN_DEBUG, block, i); } } -- 2.30.2
next prev parent reply other threads:[~2022-04-11 14:01 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-11 14:00 [CI v3 00/12] drm/edid: low level EDID block read refactoring etc Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 01/12] drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 02/12] drm/edid: have edid_block_check() detect blocks that are all zero Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 03/12] drm/edid: refactor EDID block status printing Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` Jani Nikula [this message] 2022-04-11 14:00 ` [Intel-gfx] [CI v3 04/12] drm/edid: add a helper to log dump an EDID block Jani Nikula 2022-04-11 14:00 ` [CI v3 05/12] drm/edid: pass struct edid to connector_bad_edid() Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 06/12] drm/edid: add typedef for block read function Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 07/12] drm/edid: abstract an EDID block read helper Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 08/12] drm/edid: use EDID block read helper in drm_do_get_edid() Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 09/12] drm/edid: convert extension block read to EDID block read helper Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 10/12] drm/edid: drop extra local var Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 11/12] drm/edid: add single point of return to drm_do_get_edid() Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 14:00 ` [CI v3 12/12] drm/edid: add EDID block count and size helpers Jani Nikula 2022-04-11 14:00 ` [Intel-gfx] " Jani Nikula 2022-04-11 17:54 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/edid: low level EDID block read refactoring etc. (rev5) Patchwork 2022-04-11 21:03 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2022-04-12 12:18 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: low level EDID block read refactoring etc. (rev6) Patchwork 2022-04-14 4:07 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: low level EDID block read refactoring etc. (rev7) Patchwork 2022-04-14 7:52 ` [Intel-gfx] ✗ Fi.CI.IGT: " Patchwork 2022-04-14 11:10 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: low level EDID block read refactoring etc. (rev8) Patchwork 2022-04-14 13:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/edid: low level EDID block read refactoring etc. (rev9) Patchwork 2022-04-14 14:09 ` [CI v3 00/12] drm/edid: low level EDID block read refactoring etc Jani Nikula 2022-04-14 14:09 ` [Intel-gfx] " Jani Nikula 2022-04-14 14:24 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/edid: low level EDID block read refactoring etc. (rev8) Patchwork 2022-04-14 15:59 ` [Intel-gfx] ✓ Fi.CI.IGT: success for drm/edid: low level EDID block read refactoring etc. (rev9) 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=b56f120a26f54b0defc43faa6d49e26f072d4d8f.1649685475.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: linkBe 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.