Merge tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm...
authorDave Airlie <airlied@redhat.com>
Wed, 27 Dec 2017 19:20:07 +0000 (05:20 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 27 Dec 2017 19:20:07 +0000 (05:20 +1000)
commit03bfd4e19b935adb8be4f7342f13395fb7f11096
treef210f9d6e98dc65d6aaa9fde043e4fe2b73636c8
parente100ff380ce936fc1e7ae8ba16621ddf5dddffcb
parent8bc0d7ac934b6f2d0dc8f38a3104d281c9db1e98
Merge tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

GLK pipe C related fix, and a gvt fix.

* tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel:
  i915: Reject CCS modifiers for pipe C on Geminilake
  drm/i915/gvt: Fix pipe A enable as default for vgpu