Message ID | e7c6d561ab086e2348611c374cb590eaa7b27dce.1680190534.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm: reduce drm_detect_monitor_audio/drm_detect_hdmi_monitor/edid_blob_ptr usage | expand |
Am Donnerstag, 30. März 2023, 17:39:47 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> Acked-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 8526dda91931..b6afe3786b74 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 8526dda91931..b6afe3786b74 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(-)