drm/amd/display: Guard against null stream dereference in do flip

[Why]

During suspend under some hardware configurations can result in a
series of atomic commits with a NULL stream status - which
causes a NULL pointer dereference. This should be guarded.

[How]

Exit early from the function - if we can't access the stream then
there isn't anything that can be done here.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index ca41d1fc51ba30d689d32d5eac2a9ab334040a03..d5c611ada4cf96e5010a697f4235de52502377b7 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4079,6 +4079,7 @@ static void amdgpu_dm_do_flip(struct drm_crtc *crtc,
        /* TODO eliminate or rename surface_update */
        struct dc_surface_update surface_updates[1] = { {0} };
        struct dm_crtc_state *acrtc_state = to_dm_crtc_state(crtc->state);
+       struct dc_stream_status *stream_status;
 
 
        /* Prepare wait for target vblank early - before the fence-waits */
@@ -4134,7 +4135,19 @@ static void amdgpu_dm_do_flip(struct drm_crtc *crtc,
 
        spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
 
-       surface_updates->surface = dc_stream_get_status(acrtc_state->stream)->plane_states[0];
+       stream_status = dc_stream_get_status(acrtc_state->stream);
+       if (!stream_status) {
+               DRM_ERROR("No stream status for CRTC: id=%d\n",
+                       acrtc->crtc_id);
+               return;
+       }
+
+       surface_updates->surface = stream_status->plane_states[0];
+       if (!surface_updates->surface) {
+               DRM_ERROR("No surface for CRTC: id=%d\n",
+                       acrtc->crtc_id);
+               return;
+       }
        surface_updates->flip_addr = &addr;
 
        dc_commit_updates_for_stream(adev->dm.dc,