drm/amd/amdgpu: Check stream in amdgpu_dm_commit_planes
authorErnst Sjöstrand <ernstp@gmail.com>
Mon, 24 Jun 2019 15:15:42 +0000 (17:15 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Jun 2019 18:23:43 +0000 (13:23 -0500)
Reported by smatch:
amdgpu_dm.c:5637 amdgpu_dm_commit_planes() error: we previously assumed 'acrtc_state->stream' could be null
This seems to be checked for null pretty consistently elsewhere.

Signed-off-by: Ernst Sjöstrand <ernstp@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 4c70a08..df08ea1 100644 (file)
@@ -5671,7 +5671,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
        }
 
        /* Update the planes if changed or disable if we don't have any. */
-       if (planes_count || acrtc_state->active_planes == 0) {
+       if ((planes_count || acrtc_state->active_planes == 0) &&
+               acrtc_state->stream) {
                if (new_pcrtc_state->mode_changed) {
                        bundle->stream_update.src = acrtc_state->stream->src;
                        bundle->stream_update.dst = acrtc_state->stream->dst;