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 10/12] drm/edid: split out invalid block filtering to a separate function Date: Tue, 29 Mar 2022 21:42:17 +0300 [thread overview] Message-ID: <04d5ad0bbb43267f32312bccbab8a1f4c80565a1.1648578814.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1648578814.git.jani.nikula@intel.com> It's such a special case there's no point in keeping it inline in the happy day scenario, confusing matters. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- 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 a1be5c3a80e5..dee95332d7e1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1821,6 +1821,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, *base; + int i; + + new = kmalloc_array(valid_extensions + 1, EDID_LENGTH, GFP_KERNEL); + if (!new) + goto out; + + base = new; + for (i = 0; i <= edid->extensions; i++) { + const void *block = edid + i; + + if (edid_block_valid(block, i == 0)) + memcpy(base++, 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 @@ -2070,32 +2097,9 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, } if (valid_extensions != edid->extensions) { - struct edid *base; - int i; - connector_bad_edid(connector, (u8 *)edid, edid->extensions + 1); - edid->checksum += edid->extensions - valid_extensions; - edid->extensions = valid_extensions; - - new = kmalloc_array(valid_extensions + 1, EDID_LENGTH, - GFP_KERNEL); - if (!new) - goto out; - - base = new; - for (i = 0; i <= edid->extensions; i++) { - void *block = edid + i; - - if (!edid_block_valid(block, i == 0)) - continue; - - memcpy(base, block, EDID_LENGTH); - base++; - } - - kfree(edid); - edid = new; + edid = edid_filter_invalid_blocks(edid, valid_extensions); } return edid; -- 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 10/12] drm/edid: split out invalid block filtering to a separate function Date: Tue, 29 Mar 2022 21:42:17 +0300 [thread overview] Message-ID: <04d5ad0bbb43267f32312bccbab8a1f4c80565a1.1648578814.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1648578814.git.jani.nikula@intel.com> It's such a special case there's no point in keeping it inline in the happy day scenario, confusing matters. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- 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 a1be5c3a80e5..dee95332d7e1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1821,6 +1821,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, *base; + int i; + + new = kmalloc_array(valid_extensions + 1, EDID_LENGTH, GFP_KERNEL); + if (!new) + goto out; + + base = new; + for (i = 0; i <= edid->extensions; i++) { + const void *block = edid + i; + + if (edid_block_valid(block, i == 0)) + memcpy(base++, 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 @@ -2070,32 +2097,9 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, } if (valid_extensions != edid->extensions) { - struct edid *base; - int i; - connector_bad_edid(connector, (u8 *)edid, edid->extensions + 1); - edid->checksum += edid->extensions - valid_extensions; - edid->extensions = valid_extensions; - - new = kmalloc_array(valid_extensions + 1, EDID_LENGTH, - GFP_KERNEL); - if (!new) - goto out; - - base = new; - for (i = 0; i <= edid->extensions; i++) { - void *block = edid + i; - - if (!edid_block_valid(block, i == 0)) - continue; - - memcpy(base, block, EDID_LENGTH); - base++; - } - - kfree(edid); - edid = new; + edid = edid_filter_invalid_blocks(edid, valid_extensions); } return edid; -- 2.30.2
next prev parent reply other threads:[~2022-03-29 18:43 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-29 18:42 [PATCH 00/12] drm/edid: cleanup and refactoring around validity checks Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 01/12] drm/edid: use struct edid * in drm_do_get_edid() Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-30 13:05 ` Ville Syrjälä 2022-03-30 13:05 ` [Intel-gfx] " Ville Syrjälä 2022-03-30 15:16 ` Jani Nikula 2022-03-30 15:16 ` [Intel-gfx] " Jani Nikula 2022-03-30 15:39 ` Ville Syrjälä 2022-03-30 15:39 ` [Intel-gfx] " Ville Syrjälä 2022-03-30 16:28 ` Jani Nikula 2022-03-30 16:28 ` [Intel-gfx] " Jani Nikula 2022-03-30 16:50 ` Ville Syrjälä 2022-03-30 16:50 ` [Intel-gfx] " Ville Syrjälä 2022-03-30 17:09 ` Jani Nikula 2022-03-30 21:01 ` Jani Nikula 2022-03-30 21:01 ` [Intel-gfx] " Jani Nikula 2022-03-31 18:46 ` Jani Nikula 2022-03-31 18:46 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 02/12] drm/edid: clean up EDID block checksum functions Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 03/12] drm/edid: add edid_block_tag() helper to get the EDID extension tag Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 04/12] drm/edid: make drm_edid_header_is_valid() accept void pointer Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 05/12] drm/edid: clean up edid_is_zero() Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 06/12] drm/edid: split out edid_header_fix() Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 07/12] drm/edid: split drm_edid_block_valid() to check and act parts Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-31 14:54 ` Ville Syrjälä 2022-03-31 14:54 ` [Intel-gfx] " Ville Syrjälä 2022-03-31 15:54 ` Jani Nikula 2022-03-31 15:54 ` [Intel-gfx] " Jani Nikula 2022-03-31 16:49 ` Jani Nikula 2022-03-31 16:49 ` [Intel-gfx] " Jani Nikula 2022-03-31 16:58 ` Ville Syrjälä 2022-03-31 16:58 ` [Intel-gfx] " Ville Syrjälä 2022-03-29 18:42 ` [PATCH 08/12] drm/edid: use a better variable name for EDID block read retries Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-31 14:55 ` Ville Syrjälä 2022-03-31 14:55 ` [Intel-gfx] " Ville Syrjälä 2022-03-29 18:42 ` [PATCH 09/12] drm/edid: simplify block check when filtering invalid blocks Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` Jani Nikula [this message] 2022-03-29 18:42 ` [Intel-gfx] [PATCH 10/12] drm/edid: split out invalid block filtering to a separate function Jani Nikula 2022-03-29 18:42 ` [PATCH 11/12] drm/edid: track invalid blocks in drm_do_get_edid() Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-29 18:42 ` [PATCH 12/12] drm/edid: reduce magic when updating the EDID block checksum Jani Nikula 2022-03-29 18:42 ` [Intel-gfx] " Jani Nikula 2022-03-31 14:59 ` Ville Syrjälä 2022-03-31 14:59 ` [Intel-gfx] " Ville Syrjälä 2022-03-29 19:33 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/edid: cleanup and refactoring around validity checks Patchwork 2022-03-29 19:37 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork 2022-03-29 20:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-03-29 21:26 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2022-03-31 17:07 ` [PATCH 00/12] " Ville Syrjälä 2022-03-31 17:07 ` [Intel-gfx] " Ville Syrjälä
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=04d5ad0bbb43267f32312bccbab8a1f4c80565a1.1648578814.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.