summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_edid.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2022-04-11 17:00:24 +0300
committerJani Nikula <jani.nikula@intel.com>2022-04-14 16:51:10 +0300
commit8baccb27db403afa865b7f9a1452371a23d9bf45 (patch)
tree4b23167da5ff942b4cd9bf552c44b6e20c9425b2 /drivers/gpu/drm/drm_edid.c
parent9d79799193b728b62c9899d931b5009da1f89b67 (diff)
downloadlinux-stable-8baccb27db403afa865b7f9a1452371a23d9bf45.tar.gz
linux-stable-8baccb27db403afa865b7f9a1452371a23d9bf45.tar.bz2
linux-stable-8baccb27db403afa865b7f9a1452371a23d9bf45.zip
drm/edid: convert edid_is_zero() to edid_block_is_zero() for blocks
As edid_is_zero() is only ever used on EDID blocks, convert it to edid_block_is_zero() with implicit block size. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/5cc9387e22b4a61243df4053d1ebcc14b0007dc8.1649685475.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
-rw-r--r--drivers/gpu/drm/drm_edid.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index dbca588474c3..a8eedc38a39e 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1632,9 +1632,9 @@ static int edid_block_tag(const void *_block)
return block[0];
}
-static bool edid_is_zero(const void *edid, int length)
+static bool edid_block_is_zero(const void *edid)
{
- return !memchr_inv(edid, 0, length);
+ return !memchr_inv(edid, 0, EDID_LENGTH);
}
/**
@@ -1785,7 +1785,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid,
}
if (!valid && print_bad_edid) {
- if (edid_is_zero(block, EDID_LENGTH)) {
+ if (edid_block_is_zero(block)) {
pr_notice("EDID block is all zeroes\n");
} else {
pr_notice("Raw EDID:\n");
@@ -1942,7 +1942,7 @@ static void connector_bad_edid(struct drm_connector *connector,
u8 *block = edid + i * EDID_LENGTH;
char prefix[20];
- if (edid_is_zero(block, EDID_LENGTH))
+ 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);
@@ -2019,7 +2019,7 @@ static struct edid *drm_do_get_edid_base_block(struct drm_connector *connector,
goto out;
if (drm_edid_block_valid(edid, 0, false, edid_corrupt))
break;
- if (try == 0 && edid_is_zero(edid, EDID_LENGTH)) {
+ if (try == 0 && edid_block_is_zero(edid)) {
if (null_edid_counter)
(*null_edid_counter)++;
goto carp;