]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a7d2f4 c34674a)
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)
 - 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
1  2 
drivers/gpu/drm/qxl/qxl_drv.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/qxl/qxl_drv.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.