linux-stable.git/drivers/gpu/drm/amd/display/amdgpu_dm, branch linux-4.15.y

drm/amd/display: Add one to EDID's audio channel count when passing to DC

2018-03-28T16:22:59+00:00

commit 731a373698c9675d5aed8a30d8c9861bea9c41a2 upstream.

DC takes channel count to mean the actual count. cea_sad's channels
represent it as number of channels - 1.

Signed-off-by: Harry Wentland 
Reviewed-by: Tony Cheng 
Acked-by: Harry Wentland 
Signed-off-by: Alex Deucher 
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman

drm/amd/display: We shouldn't set format_default on plane as atomic driver

2018-03-28T16:22:59+00:00

commit 509648fcf0ce8650184649b43ad039f78dde155f upstream.

This is still a leftover from early atomic brinup days.

Signed-off-by: Harry Wentland 
Reviewed-by: Tony Cheng 
Acked-by: Harry Wentland 
Signed-off-by: Alex Deucher 
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman

drm/amd/display: Fix rehook MST display not light back on

2017-12-15T22:32:42+00:00

Original applied dm_restore_drm_connector_state() has got removed.
Set link status to BAD before hotplug() event could trigger
another modeset from userspace.

The fix "Fix MST daisy chain SST not light up" commit makes so it is trying
to create a stream prior to dc_sink. That makes dc_sink is not present in
create_stream_for_sink().

Signed-off-by: Jerry (Fangzhi) Zuo 
Reviewed-by: Roman Li 
Acked-by: Harry Wentland 
Signed-off-by: Alex Deucher

drm/amdgpu: add license to Makefiles

2017-12-04T16:47:55+00:00

Was missing license text.

Acked-by: Harry Wentland 
Acked-by: Felix Kuehling 
Acked-by: Christian König 
Signed-off-by: Alex Deucher

drm/amd/display: Switch to drm_atomic_helper_wait_for_flip_done

2017-11-28T22:57:01+00:00

This new helper function is advised to be used for drviers that
use the nonblocking commit tracking support instead of
drm_atomic_helper_wait_for_vblanks.

Signed-off-by: Andrey Grodzovsky 
Reviewed-by: Harry Wentland 
Reviewed-and-Tested-by: Michel Dänzer 
Signed-off-by: Alex Deucher

drm/amd/display: fix gamma setting

2017-11-28T22:56:54+00:00

Adding gamma changed check as condition for affected plane.
We ignored adding plane as affected if modeset was not required.
But for color management change we still need it.

Signed-off-by: Roman Li 
Reviewed-by: Tony Cheng 
Acked-by: Harry Wentland 
Signed-off-by: Alex Deucher

drm/amd/display: Do not put drm_atomic_state on resume

2017-11-28T22:56:46+00:00

drm_atomic_helper_resume now puts it for us. See relevant patch here:
https://lists.freedesktop.org/archives/dri-devel/2017-October/154268.html

Signed-off-by: Leo (Sunpeng) Li 
Reviewed-by: Harry Wentland 
Signed-off-by: Alex Deucher

drm/amd/display: Fix amdgpu_dm bugs found by smatch

2017-11-28T22:56:03+00:00

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2760
create_eml_sink() warn: variable dereferenced before check
'aconnector->base.edid_blob_ptr' (see line 2758)
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4270
amdgpu_dm_atomic_commit_tail() warn: variable dereferenced before check
'dm_new_crtc_state->stream' (see line 4266)
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4417
dm_restore_drm_connector_state() warn: variable dereferenced before
check 'disconnected_acrtc' (see line 4415)

Signed-off-by: Harry Wentland 
Reviewed-by: Sun peng Li 
Acked-by: Harry Wentland 
Signed-off-by: Alex Deucher

drm/amd/display: Do DC mode-change check when adding CRTCs

2017-11-28T22:55:26+00:00

Within atomic check, dm_update_crtcs_state is called twice. First to
remove from the dc_state, and subsequently to add to it.

In both calls, a secondary mode-change check is done using dc-level
states. We shouldn't be doing this while removing, since a new
dc_stream_state has not been created to do the necessary comparison.
Because of this, the mode_changed flag within the DRM state can be
mistakenly set to false. Doing so only when adding prevents this.

We are also guaranteed that a call to add will come after remove, or
else the atomic check fails (and a commit will not happen).

Signed-off-by: Leo (Sunpeng) Li 
Reviewed-by: Tony Cheng 
Acked-by: Harry Wentland 
Signed-off-by: Alex Deucher

drm/amd/display: Check aux channel before MST resume

2017-11-28T22:54:58+00:00

It is to fix: MST display failed to resume from S3

At the beginning of resume from S3, need to check if mgr->aux is
NULL. Fake MST encoder doesn't have real aux channel.

Signed-off-by: Jerry (Fangzhi) Zuo 
Reviewed-by: Roman Li 
Acked-by: Harry Wentland 
Signed-off-by: Alex Deucher