| Message ID | 5b36683b656446a4d9a172d4dca1cf9aca08a48b.1652097712.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: introduce struct drm_edid | expand |
LGTM. Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Regards, Ankit On 5/9/2022 5:33 PM, Jani Nikula wrote: > We'll need to propagate drm_edid everywhere. > > v2: Handle NULL EDID pointer (Ville, CI) > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/drm_edid.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index d857d1d74c82..26ac4d262e31 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -6364,15 +6364,15 @@ static void drm_parse_tiled_block(struct drm_connector *connector, > } > } > > -void drm_update_tile_info(struct drm_connector *connector, > - const struct edid *edid) > +static void _drm_update_tile_info(struct drm_connector *connector, > + const struct drm_edid *drm_edid) > { > const struct displayid_block *block; > struct displayid_iter iter; > > connector->has_tile = false; > > - displayid_iter_edid_begin(edid, &iter); > + displayid_iter_edid_begin(drm_edid ? drm_edid->edid : NULL, &iter); > displayid_iter_for_each(block, &iter) { > if (block->tag == DATA_BLOCK_TILED_DISPLAY) > drm_parse_tiled_block(connector, block); > @@ -6384,3 +6384,11 @@ void drm_update_tile_info(struct drm_connector *connector, > connector->tile_group = NULL; > } > } > + > +void drm_update_tile_info(struct drm_connector *connector, > + const struct edid *edid) > +{ > + struct drm_edid drm_edid; > + > + _drm_update_tile_info(connector, drm_edid_legacy_init(&drm_edid, edid)); > +}
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index d857d1d74c82..26ac4d262e31 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6364,15 +6364,15 @@ static void drm_parse_tiled_block(struct drm_connector *connector, } } -void drm_update_tile_info(struct drm_connector *connector, - const struct edid *edid) +static void _drm_update_tile_info(struct drm_connector *connector, + const struct drm_edid *drm_edid) { const struct displayid_block *block; struct displayid_iter iter; connector->has_tile = false; - displayid_iter_edid_begin(edid, &iter); + displayid_iter_edid_begin(drm_edid ? drm_edid->edid : NULL, &iter); displayid_iter_for_each(block, &iter) { if (block->tag == DATA_BLOCK_TILED_DISPLAY) drm_parse_tiled_block(connector, block); @@ -6384,3 +6384,11 @@ void drm_update_tile_info(struct drm_connector *connector, connector->tile_group = NULL; } } + +void drm_update_tile_info(struct drm_connector *connector, + const struct edid *edid) +{ + struct drm_edid drm_edid; + + _drm_update_tile_info(connector, drm_edid_legacy_init(&drm_edid, edid)); +}
We'll need to propagate drm_edid everywhere. v2: Handle NULL EDID pointer (Ville, CI) Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)