drm/amd/display: Add NULL check for local sink in edp_power_control
authorYue Hin Lau <Yuehin.Lau@amd.com>
Wed, 27 Jun 2018 17:49:20 +0000 (13:49 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 13 Jul 2018 19:51:28 +0000 (14:51 -0500)
[WHY]
PNP cause bsod regression fix

[HOW]
Add NULL check

Signed-off-by: Yue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: Hugo Hu <Hugo.Hu@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

index 109d410..e48eb30 100644 (file)
@@ -871,9 +871,11 @@ void hwss_edp_power_control(
                        unsigned long long wait_time_ms = 0;
 
                        /* max 500ms from LCDVDD off to on */
-                       unsigned long long edp_poweroff_time_ms =
-                                       500 + link->local_sink->edid_caps.panel_patch.extra_t12_ms;
+                       unsigned long long edp_poweroff_time_ms = 500;
 
+                       if (link->local_sink != NULL)
+                               edp_poweroff_time_ms =
+                                               500 + link->local_sink->edid_caps.panel_patch.extra_t12_ms;
                        if (link->link_trace.time_stamp.edp_poweroff == 0)
                                wait_time_ms = edp_poweroff_time_ms;
                        else if (duration_in_ms < edp_poweroff_time_ms)