diff options
| author |   Ernst Sjöstrand <ernstp@gmail.com> | 2019-06-24 17:15:42 +0200 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2019-06-25 13:23:43 -0500 |
| commit | ed9656fbc8b5b13a2350d9a7eb70f1b8d55e5803 (patch) | |
| tree | f51e37f39043dfa1957b380901dcca63dfc7b5c0 /drivers/gpu/drm/amd/display | |
| parent | drm/amd/amdgpu: amdgpu_hwmon_show_temp: initialize temp (diff) | |
| download | linux-dev-ed9656fbc8b5b13a2350d9a7eb70f1b8d55e5803.tar.xz linux-dev-ed9656fbc8b5b13a2350d9a7eb70f1b8d55e5803.zip | |
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 <ernstp@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |