mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-12 11:36:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Browse source 
One last fix for 4.17.  Fix a suspend regression in DC.

* 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/display: Fix BUG_ON during CRTC atomic check update
This commit is contained in:
Dave Airlie 2018-05-30 10:58:31 +10:00
commit 2b85352e3b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View file

@ -4695,15 +4695,16 @@ static int dm_update_crtcs_state(struct dc *dc,
* We want to do dc stream updates that do not require a * We want to do dc stream updates that do not require a
* full modeset below. * full modeset below.
*/ */
if (!enable || !aconnector || modereset_required(new_crtc_state)) if (!(enable && aconnector && new_crtc_state->enable &&
new_crtc_state->active))
continue; continue;
/* /*
* Given above conditions, the dc state cannot be NULL because: * Given above conditions, the dc state cannot be NULL because:
* 1. We're attempting to enable a CRTC. Which has a... * 1. We're in the process of enabling CRTCs (just been added
* 2. Valid connector attached, and * to the dc context, or already is on the context)
* 3. User does not want to reset it (disable or mark inactive, * 2. Has a valid connector attached, and
* which can happen on a CRTC that's already disabled). * 3. Is currently active and enabled.
* => It currently exists. * => The dc stream state currently exists.
*/ */
BUG_ON(dm_new_crtc_state->stream == NULL); BUG_ON(dm_new_crtc_state->stream == NULL);