Merge tag 'drm-misc-next-fixes-2019-03-13' of git://anongit.freedesktop.org/drm/drm...
authorDave Airlie <airlied@redhat.com>
Thu, 14 Mar 2019 01:37:31 +0000 (11:37 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 14 Mar 2019 01:37:46 +0000 (11:37 +1000)
commit74cd45fa90a234de92a3f3ce8bdabeb643b546a5
tree3a8c874c5ece28e93bc90f13e01fbecdd8eff29c
parent3a7d2f4f4427f4b241f8240e370099e2ec1fd307
parentc34674a23d1e8674ac532bf3397333f24a41e7b2
Merge tag 'drm-misc-next-fixes-2019-03-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

 - qxl: Remove the conflicting framebuffers earlier
 - Split out some i915 code into the fb_helper to allow the above

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190313192158.k3qssf733khsqodn@flea
drivers/gpu/drm/qxl/qxl_drv.c