| Message ID | b0ab3e9fc5836e94a3ea8914d45c5084becb9a14.1672826282.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: info & modes parsing and drm_edid refactors | expand |
On Wed, Jan 04, 2023 at 12:05:31PM +0200, Jani Nikula wrote: > By moving update_display_info() out of _drm_edid_connector_update() we > make the function purely about adding modes. Rename accordingly. > > 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> > --- > drivers/gpu/drm/drm_edid.c | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 5881df5bddb9..95c383220afc 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -6663,19 +6663,12 @@ static int add_displayid_detailed_modes(struct drm_connector *connector, > return num_modes; > } > > -static int _drm_edid_connector_update(struct drm_connector *connector, > - const struct drm_edid *drm_edid) > +static int _drm_edid_connector_add_modes(struct drm_connector *connector, > + const struct drm_edid *drm_edid) > { > const struct drm_display_info *info = &connector->display_info; > int num_modes = 0; > > - /* > - * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks. > - * To avoid multiple parsing of same block, lets parse that map > - * from sink info, before parsing CEA modes. > - */ > - update_display_info(connector, drm_edid); > - > if (!drm_edid) > return 0; > > @@ -6780,7 +6773,9 @@ int drm_edid_connector_update(struct drm_connector *connector, > { > int count; > > - count = _drm_edid_connector_update(connector, drm_edid); > + update_display_info(connector, drm_edid); > + > + count = _drm_edid_connector_add_modes(connector, drm_edid); > > _drm_update_tile_info(connector, drm_edid); > > @@ -6850,7 +6845,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property); > */ > int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) > { > - struct drm_edid drm_edid; > + struct drm_edid _drm_edid; > + const struct drm_edid *drm_edid; > > if (edid && !drm_edid_is_valid(edid)) { > drm_warn(connector->dev, "[CONNECTOR:%d:%s] EDID invalid.\n", > @@ -6858,8 +6854,11 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) > edid = NULL; > } > > - return _drm_edid_connector_update(connector, > - drm_edid_legacy_init(&drm_edid, edid)); > + drm_edid = drm_edid_legacy_init(&_drm_edid, edid); > + > + update_display_info(connector, drm_edid); > + > + return _drm_edid_connector_add_modes(connector, drm_edid); > } > EXPORT_SYMBOL(drm_add_edid_modes); > > -- > 2.34.1
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 5881df5bddb9..95c383220afc 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6663,19 +6663,12 @@ static int add_displayid_detailed_modes(struct drm_connector *connector, return num_modes; } -static int _drm_edid_connector_update(struct drm_connector *connector, - const struct drm_edid *drm_edid) +static int _drm_edid_connector_add_modes(struct drm_connector *connector, + const struct drm_edid *drm_edid) { const struct drm_display_info *info = &connector->display_info; int num_modes = 0; - /* - * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks. - * To avoid multiple parsing of same block, lets parse that map - * from sink info, before parsing CEA modes. - */ - update_display_info(connector, drm_edid); - if (!drm_edid) return 0; @@ -6780,7 +6773,9 @@ int drm_edid_connector_update(struct drm_connector *connector, { int count; - count = _drm_edid_connector_update(connector, drm_edid); + update_display_info(connector, drm_edid); + + count = _drm_edid_connector_add_modes(connector, drm_edid); _drm_update_tile_info(connector, drm_edid); @@ -6850,7 +6845,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property); */ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) { - struct drm_edid drm_edid; + struct drm_edid _drm_edid; + const struct drm_edid *drm_edid; if (edid && !drm_edid_is_valid(edid)) { drm_warn(connector->dev, "[CONNECTOR:%d:%s] EDID invalid.\n", @@ -6858,8 +6854,11 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) edid = NULL; } - return _drm_edid_connector_update(connector, - drm_edid_legacy_init(&drm_edid, edid)); + drm_edid = drm_edid_legacy_init(&_drm_edid, edid); + + update_display_info(connector, drm_edid); + + return _drm_edid_connector_add_modes(connector, drm_edid); } EXPORT_SYMBOL(drm_add_edid_modes);
By moving update_display_info() out of _drm_edid_connector_update() we make the function purely about adding modes. Rename accordingly. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)