From 13787b1426a9d75478527f35989fe5fcb98a4c23 Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani.nikula@intel.com>
Date: Thu, 31 Mar 2022 21:45:07 +0300
Subject: drm/edid: split out invalid block filtering to a separate function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Git-commit: 4ec53461d69010b7b5d39fdc558e9c3044418288
Patch-mainline: v5.19-rc1
References: jsc#PED-1166 jsc#PED-1168 jsc#PED-1170 jsc#PED-1218 jsc#PED-1220 jsc#PED-1222 jsc#PED-1223 jsc#PED-1225
It's such a special case there's no point in keeping it inline in the
happy day scenario, confusing matters.
v2: Rebase on the invalid block filtering fix
Cc: Ville Syrj채l채 <ville.syrjala@linux.intel.com>
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/ea8ccd654b5beca6ccf99666754aea09c836b6a5.1648752228.git.jani.nikula@intel.com
Acked-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/gpu/drm/drm_edid.c | 52 ++++++++++++++++++++------------------
1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 4803033d44fd..73bb2c4a7014 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1823,6 +1823,33 @@ bool drm_edid_is_valid(struct edid *edid)
}
EXPORT_SYMBOL(drm_edid_is_valid);
+static struct edid *edid_filter_invalid_blocks(const struct edid *edid,
+ int valid_extensions)
+{
+ struct edid *new, *dest_block;
+ int i;
+
+ new = kmalloc_array(valid_extensions + 1, EDID_LENGTH, GFP_KERNEL);
+ if (!new)
+ goto out;
+
+ dest_block = new;
+ for (i = 0; i <= edid->extensions; i++) {
+ const void *block = edid + i;
+
+ if (edid_block_valid(block, i == 0))
+ memcpy(dest_block++, block, EDID_LENGTH);
+ }
+
+ new->checksum += new->extensions - valid_extensions;
+ new->extensions = valid_extensions;
+
+out:
+ kfree(edid);
+
+ return new;
+}
+
#define DDC_SEGMENT_ADDR 0x30
/**
* drm_do_probe_ddc_edid() - get EDID information via I2C
@@ -2072,32 +2099,9 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
}
if (valid_extensions != edid->extensions) {
- struct edid *dest_block;
- int i;
-
connector_bad_edid(connector, (u8 *)edid, edid->extensions + 1);
- new = kmalloc_array(valid_extensions + 1, EDID_LENGTH,
- GFP_KERNEL);
- if (!new)
- goto out;
-
- dest_block = new;
- for (i = 0; i <= edid->extensions; i++) {
- void *block = edid + i;
-
- if (!edid_block_valid(block, i == 0))
- continue;
-
- memcpy(dest_block, block, EDID_LENGTH);
- dest_block++;
- }
-
- new->checksum += new->extensions - valid_extensions;
- new->extensions = valid_extensions;
-
- kfree(edid);
- edid = new;
+ edid = edid_filter_invalid_blocks(edid, valid_extensions);
}
return edid;
--
2.38.1