Merge branch 'drm-fixes-4.17' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 30 May 2018 00:58:31 +0000 (10:58 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 30 May 2018 00:58:31 +0000 (10:58 +1000)
commit2b85352e3b08159c9d5c82144d05767a00169f9d
treeceb7f9b1b0d16f40bb1381fa371ac3191c325130
parentebb442bb35e8c35eb765b04423b28392b4df7a04
parent20fa2ff0441eabc8e6263b428191228d9599ea9d
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