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

When the separate add modes call was added back in commit c533b51 ("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: bbaa <[email protected]> Closes: https://lore.kernel.org/r/[email protected] Fixes: c533b51 ("drm/edid: add separate drm_edid_connector_add_modes()") Cc: <[email protected]> # v6.3+ Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
pop-os · Dec 11, 2023 · 759f14e · 759f14e
1 parent 35c49cf
commit 759f14e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
@@ -2309,7 +2309,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);