From: Jani Nikula Date: Thu, 1 Sep 2022 12:47:10 +0000 (+0300) Subject: drm/rockchip: cdn-dp: call drm_connector_update_edid_property() unconditionally X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bfdede3a58ea970333d77a05144a7bcec13cf515;p=linux.git drm/rockchip: cdn-dp: call drm_connector_update_edid_property() unconditionally 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 Cc: Heiko Stübner Signed-off-by: Jani Nikula Reviewed-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/bb733eccfb389533cc6e207689be845164a1ed91.1662036058.git.jani.nikula@intel.com --- diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index 8526dda919317..b6afe3786b742 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);