Commit 9c761e75 authored by Jani Nikula's avatar Jani Nikula Committed by Peng Zhang
Browse files

drm/edid: also call add modes in EDID connector update fallback 

stable inclusion
from stable-v6.6.8
commit a511e851d49e13835f0da022d48e873c8cc15827
bugzilla: https://gitee.com/openeuler/kernel/issues/I99K53

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a511e851d49e13835f0da022d48e873c8cc15827



--------------------------------

commit 759f14e20891de72e676d9d738eb2c573aa15f52 upstream.

When the separate add modes call was added back in commit c533b516
("drm/edid: add separate drm_edid_connector_add_modes()"), it failed to
address drm_edid_override_connector_update(). Also call add modes there.

Reported-by: default avatarbbaa <bbaa@bbaa.fun>
Closes: https://lore.kernel.org/r/930E9B4C7D91FDFF+29b34d89-8658-4910-966a-c772f320ea03@bbaa.fun


Fixes: c533b516 ("drm/edid: add separate drm_edid_connector_add_modes()")
Cc: <stable@vger.kernel.org> # v6.3+
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231207093821.2654267-1-jani.nikula@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 2fcacf75

drivers/gpu/drm/drm_edid.c

+2 −1
Original line number Diff line number Diff line
@@ -2308,7 +2308,8 @@ int drm_edid_override_connector_update(struct drm_connector *connector) 


	override = drm_edid_override_get(connector);

	if (override) {

		num_modes = drm_edid_connector_update(connector, override);

		if (drm_edid_connector_update(connector, override) == 0)

			num_modes = drm_edid_connector_add_modes(connector);



		drm_edid_free(override);