From 5ef88dc58ea32a695008c77ad03df862172f40c7 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 29 Mar 2021 16:37:18 +0300 Subject: [PATCH] drm/edid: use the new displayid iterator for detailed modes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Neatly reduce displayid boilerplate in code. No functional changes. Reviewed-by: Ville Syrjälä Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/f6c69c545c553c4a616887540660a4b8aecf0f7f.1617024940.git.jani.nikula@intel.com --- drivers/gpu/drm/drm_edid.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 58e61f792bc7..fbaa7d679cb2 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -5333,27 +5333,16 @@ static int add_displayid_detailed_1_modes(struct drm_connector *connector, static int add_displayid_detailed_modes(struct drm_connector *connector, struct edid *edid) { - const u8 *displayid; - int length, idx; const struct displayid_block *block; + struct displayid_iter iter; int num_modes = 0; - int ext_index = 0; - - for (;;) { - displayid = drm_find_displayid_extension(edid, &length, &idx, - &ext_index); - if (!displayid) - break; - idx += sizeof(struct displayid_hdr); - for_each_displayid_db(displayid, block, idx, length) { - switch (block->tag) { - case DATA_BLOCK_TYPE_1_DETAILED_TIMING: - num_modes += add_displayid_detailed_1_modes(connector, block); - break; - } - } + displayid_iter_edid_begin(edid, &iter); + displayid_iter_for_each(block, &iter) { + if (block->tag == DATA_BLOCK_TYPE_1_DETAILED_TIMING) + num_modes += add_displayid_detailed_1_modes(connector, block); } + displayid_iter_end(&iter); return num_modes; } -- 2.34.1