From: Ernst Sjöstrand Date: Mon, 24 Jun 2019 15:15:42 +0000 (+0200) Subject: drm/amd/amdgpu: Check stream in amdgpu_dm_commit_planes X-Git-Tag: platform-drivers-x86-v5.3-2~16^2~10^2~10 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed9656fbc8b5b13a2350d9a7eb70f1b8d55e5803;p=linux-platform-drivers-x86.git drm/amd/amdgpu: Check stream in amdgpu_dm_commit_planes 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 Signed-off-by: Alex Deucher --- 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 4c70a0803b85..df08ea172595 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -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;