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 v2 05/12] drm/edid: pass struct edid to connector_bad_edid()
Date: Mon, 11 Apr 2022 12:47:26 +0300 [thread overview]
Message-ID: <b8ded3c19bba443ce0bf86a662bd7ee3d7075555.1649670305.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1649670305.git.jani.nikula@intel.com>
Avoid casting here and there, and make it const.
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 | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 0b8098e34236..e1afd6a55a8c 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1967,7 +1967,7 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned int block, size_t len)
}
static void connector_bad_edid(struct drm_connector *connector,
- u8 *edid, int num_blocks)
+ const struct edid *edid, int num_blocks)
{
int i;
u8 last_block;
@@ -1978,22 +1978,19 @@ static void connector_bad_edid(struct drm_connector *connector,
* of 0x7e in the EDID of the _index_ of the last block in the
* combined chunk of memory.
*/
- last_block = edid[0x7e];
+ last_block = edid->extensions;
/* Calculate real checksum for the last edid extension block data */
if (last_block < num_blocks)
connector->real_edid_checksum =
- edid_block_compute_checksum(edid + last_block * EDID_LENGTH);
+ edid_block_compute_checksum(edid + last_block);
if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))
return;
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;
-
- edid_block_dump(KERN_DEBUG, block, i);
- }
+ for (i = 0; i < num_blocks; i++)
+ edid_block_dump(KERN_DEBUG, edid + i, i);
}
/* Get override or firmware EDID */
@@ -2139,7 +2136,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
}
if (invalid_blocks) {
- connector_bad_edid(connector, (u8 *)edid, edid->extensions + 1);
+ connector_bad_edid(connector, edid, edid->extensions + 1);
edid = edid_filter_invalid_blocks(edid, invalid_blocks);
}
--
2.30.2
next prev parent reply other threads:[~2022-04-11 9:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-11 9:47 [CI v2 00/12] drm/edid: low level EDID block read refactoring etc Jani Nikula
2022-04-11 9:47 ` [CI v2 01/12] drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks Jani Nikula
2022-04-11 9:47 ` [CI v2 02/12] drm/edid: have edid_block_check() detect blocks that are all zero Jani Nikula
2022-04-11 9:47 ` [CI v2 03/12] drm/edid: refactor EDID block status printing Jani Nikula
2022-04-11 9:47 ` [CI v2 04/12] drm/edid: add a helper to log dump an EDID block Jani Nikula
2022-04-11 9:47 ` Jani Nikula [this message]
2022-04-11 9:47 ` [CI v2 06/12] drm/edid: add typedef for block read function Jani Nikula
2022-04-11 9:47 ` [CI v2 07/12] drm/edid: abstract an EDID block read helper Jani Nikula
2022-04-11 9:47 ` [CI v2 08/12] drm/edid: use EDID block read helper in drm_do_get_edid() Jani Nikula
2022-04-11 9:47 ` [CI v2 09/12] drm/edid: convert extension block read to EDID block read helper Jani Nikula
2022-04-11 9:47 ` [CI v2 10/12] drm/edid: drop extra local var Jani Nikula
2022-04-11 9:47 ` [CI v2 11/12] drm/edid: add single point of return to drm_do_get_edid() Jani Nikula
2022-04-11 9:47 ` [CI v2 12/12] drm/edid: add EDID block count and size helpers Jani Nikula
2022-04-11 12:14 ` [Intel-gfx] " kernel test robot
2022-04-11 13:57 ` Jani Nikula
2022-04-11 12:24 ` kernel test robot
2022-04-11 13:54 ` Jani Nikula
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=b8ded3c19bba443ce0bf86a662bd7ee3d7075555.1649670305.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 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).