drm/amd/display: Fix driver load crash in amdgpu_dm

Browse source

[Why]
This fixes an regression introduced by:
    drm/amd/display: add stream ID and otg instance in dc_stream_state

During driver initialization, a null pointer deref is raised. This is
caused by searching for a stream status in the dc->current_state before
the dc_state swap happens at the end of dc_commit_state_no_check().
Since the swap has not happened, the dc_state to be swapped in should
be searched, and not dc->current_state.

[How]
Add a function that searches for the stream status within the given
dc_state, instead of dc->current_state. Use that before the state swap
happens in dc_commit_state_no_check().

Also remove duplicate occurrences of this function in amdgpu_dm.c.

Signed-off-by: Leo Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Acked-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

...

This commit is contained in:

Leo Li 2018-11-27 15:05:12 -05:00 • committed by Alex Deucher

parent 8d25a560b8

commit 09f609c34f

4 changed files with 35 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

View file

2

drivers/gpu/drm/amd/display/dc/core/dc.c

View file

32

drivers/gpu/drm/amd/display/dc/core/dc_stream.c

View file

3

drivers/gpu/drm/amd/display/dc/dc_stream.h

View file