| Message ID | ca35f536b8c6b25f518a56b443807256a40e7d2c.1615297748.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: overhaul displayid iterator | expand |
On Tue, Mar 09, 2021 at 03:54:12PM +0200, Jani Nikula wrote: > Neatly reduce displayid boilerplate in code. No functional changes. > > 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 | 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.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
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; }
Neatly reduce displayid boilerplate in code. No functional changes. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)