Patch "drm/edid: reset display info in drm_add_edid_modes() for NULL edid" has been added to the 5.19-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/edid: reset display info in drm_add_edid_modes() for NULL edid

to the 5.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-edid-reset-display-info-in-drm_add_edid_modes-fo.patch
and it can be found in the queue-5.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 7e4cb6e18bd165508aebf34a4f0fe37c56ccfa70
Author: Jani Nikula <jani.nikula@xxxxxxxxx>
Date:   Tue May 3 12:23:46 2022 +0300

    drm/edid: reset display info in drm_add_edid_modes() for NULL edid
    
    [ Upstream commit d10f7117aa43b0b0d1c4b878afafb6d151da441d ]
    
    If a NULL edid gets passed to drm_add_edid_modes(), we should probably
    also reset the display info.
    
    Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
    Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
    Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/2ac1c55f94a08d5e72c0b518d956a11002ec85c1.1651569697.git.jani.nikula@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index bc43e1b32092..1dea0e2f0cab 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5697,6 +5697,7 @@ static int drm_edid_connector_update(struct drm_connector *connector,
 	u32 quirks;
 
 	if (edid == NULL) {
+		drm_reset_display_info(connector);
 		clear_eld(connector);
 		return 0;
 	}