diff options
author | Jani Nikula <jani.nikula@intel.com> | 2022-09-01 15:47:10 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2023-05-02 18:49:24 +0300 |
commit | bfdede3a58ea970333d77a05144a7bcec13cf515 (patch) | |
tree | 58473f668638a7cc432b358ab2776c1ed8deda7b /drivers/gpu/drm/rockchip/cdn-dp-core.c | |
parent | 851c1aaed86260a8b5de9d03a31a5f8b0cd18dc0 (diff) | |
download | linux-stable-bfdede3a58ea970333d77a05144a7bcec13cf515.tar.gz linux-stable-bfdede3a58ea970333d77a05144a7bcec13cf515.tar.bz2 linux-stable-bfdede3a58ea970333d77a05144a7bcec13cf515.zip |
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 <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>
Link: https://patchwork.freedesktop.org/patch/msgid/bb733eccfb389533cc6e207689be845164a1ed91.1662036058.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/rockchip/cdn-dp-core.c')
-rw-r--r-- | drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 |
1 files 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); |