| Message ID | bb733eccfb389533cc6e207689be845164a1ed91.1662036058.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: convert to using is_hdmi and has_audio from display info | expand |
Am Donnerstag, 1. September 2022, 14:47:10 CEST schrieb Jani Nikula: > Calling drm_connector_update_edid_property() should be done > unconditionally instead of depending on the number of modes added. Also > match the call order in inno_hdmi and rk3066_hdmi. > > Cc: Sandy Huang <hjc@rock-chips.com> > Cc: Heiko Stübner <heiko@sntech.de> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c > index c204e9b95c1f..f77bdf5f5168 100644 > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c > @@ -273,10 +273,9 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector) > edid->width_cm, edid->height_cm); > > dp->sink_has_audio = drm_detect_monitor_audio(edid); > + > + drm_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > - if (ret) > - drm_connector_update_edid_property(connector, > - edid); > } > mutex_unlock(&dp->lock); > >
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index c204e9b95c1f..f77bdf5f5168 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -273,10 +273,9 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector) edid->width_cm, edid->height_cm); dp->sink_has_audio = drm_detect_monitor_audio(edid); + + drm_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); - if (ret) - drm_connector_update_edid_property(connector, - edid); } mutex_unlock(&dp->lock);
Calling drm_connector_update_edid_property() should be done unconditionally instead of depending on the number of modes added. Also match the call order in inno_hdmi and rk3066_hdmi. Cc: Sandy Huang <hjc@rock-chips.com> Cc: Heiko Stübner <heiko@sntech.de> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)