| Message ID | 595358f27ca2abb29ce6eaf855e106ff19df87fa.1649948562.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: CEA data block iterators, and more | expand |
On Thu, Apr 14, 2022 at 06:06:44PM +0300, Jani Nikula wrote: > If a NULL edid gets passed to drm_add_edid_modes(), we should probably > also reset the display info. One concern I had with this is resetting of eg. {width,height}_mm which might have been populated by intel_panel_add_fixed_mode(). But I think that might already happen anyway through one of the other codepaths that call drm_reset_display_info() so probably not something that is made any worse by this patch. IIRC at one point I tried to startd cleaning up the display_info mess a bit but the patches got stuck in some silly bikeshed so I gave up. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/drm_edid.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 324ce8467915..4758e78fad82 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -5721,6 +5721,7 @@ static int drm_edid_connector_update(struct drm_connector *connector, > u32 quirks; > > if (edid == NULL) { > + drm_reset_display_info(connector); > clear_eld(connector); > return 0; > } > -- > 2.30.2
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 324ce8467915..4758e78fad82 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -5721,6 +5721,7 @@ static int drm_edid_connector_update(struct drm_connector *connector, u32 quirks; if (edid == NULL) { + drm_reset_display_info(connector); clear_eld(connector); return 0; }
If a NULL edid gets passed to drm_add_edid_modes(), we should probably also reset the display info. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 1 + 1 file changed, 1 insertion(+)