Merge tag 'drm-misc-next-fixes-2021-09-09' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / dp / dp_panel.c

diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
index 440b327..2181b60 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_panel.c
+++ b/drivers/gpu/drm/msm/dp/dp_panel.c
@@ -271,7 +271,7 @@ static u8 dp_panel_get_edid_checksum(struct edid *edid)
 {
        struct edid *last_block;
        u8 *raw_edid;
-       bool is_edid_corrupt;
+       bool is_edid_corrupt = false;
 
        if (!edid) {
                DRM_ERROR("invalid edid input\n");
@@ -303,7 +303,12 @@ void dp_panel_handle_sink_request(struct dp_panel *dp_panel)
        panel = container_of(dp_panel, struct dp_panel_private, dp_panel);
 
        if (panel->link->sink_request & DP_TEST_LINK_EDID_READ) {
-               u8 checksum = dp_panel_get_edid_checksum(dp_panel->edid);
+               u8 checksum;
+
+               if (dp_panel->edid)
+                       checksum = dp_panel_get_edid_checksum(dp_panel->edid);
+               else
+                       checksum = dp_panel->connector->real_edid_checksum;
 
                dp_link_send_edid_checksum(panel->link, checksum);
                dp_link_send_test_response(panel->link);