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

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

1 files changed, 7 insertions, 6 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 1dd1142246c2..ad1ad333012a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4695,15 +4695,16 @@ next_crtc:
                  * We want to do dc stream updates that do not require a
                  * full modeset below.
                  */
-                if (!enable || !aconnector || modereset_required(new_crtc_state))
+                if (!(enable && aconnector && new_crtc_state->enable &&
+                      new_crtc_state->active))
                         continue;
                 /*
                  * Given above conditions, the dc state cannot be NULL because:
-                 * 1. We're attempting to enable a CRTC. Which has a...
-                 * 2. Valid connector attached, and
-                 * 3. User does not want to reset it (disable or mark inactive,
-                 *    which can happen on a CRTC that's already disabled).
-                 * => It currently exists.
+                 * 1. We're in the process of enabling CRTCs (just been added
+                 *    to the dc context, or already is on the context)
+                 * 2. Has a valid connector attached, and
+                 * 3. Is currently active and enabled.
+                 * => The dc stream state currently exists.
                  */
                 BUG_ON(dm_new_crtc_state->stream == NULL);