Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93279010 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into drm-fixes 

drm-qemu: virtio sparse fix, MAINTAINERS updates.

* tag 'drm-qemu-20170110' of git://git.kraxel.org/linux:
  drm: flip cirrus driver status to "obsolete".
  drm: update MAINTAINERS for qemu drivers (bochs, cirrus, qxl, virtio-gpu)
  drm/virtio: fix framebuffer sparse warning
parents 2f39258e af3076e6

MAINTAINERS

+13 −3
Original line number Diff line number Diff line
@@ -4106,12 +4106,18 @@ F: drivers/gpu/drm/bridge/ 


DRM DRIVER FOR BOCHS VIRTUAL GPU

M:	Gerd Hoffmann <kraxel@redhat.com>

S:	Odd Fixes

L:	virtualization@lists.linux-foundation.org

T:	git git://git.kraxel.org/linux drm-qemu

S:	Maintained

F:	drivers/gpu/drm/bochs/



DRM DRIVER FOR QEMU'S CIRRUS DEVICE

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

M:	Gerd Hoffmann <kraxel@redhat.com>

L:	virtualization@lists.linux-foundation.org

T:	git git://git.kraxel.org/linux drm-qemu

S:	Obsolete

W:	https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/

F:	drivers/gpu/drm/cirrus/



RADEON and AMDGPU DRM DRIVERS
@@ -4304,7 +4310,10 @@ F: Documentation/devicetree/bindings/display/renesas,du.txt 


DRM DRIVER FOR QXL VIRTUAL GPU

M:	Dave Airlie <airlied@redhat.com>

S:	Odd Fixes

M:	Gerd Hoffmann <kraxel@redhat.com>

L:	virtualization@lists.linux-foundation.org

T:	git git://git.kraxel.org/linux drm-qemu

S:	Maintained

F:	drivers/gpu/drm/qxl/

F:	include/uapi/drm/qxl_drm.h
@@ -13085,6 +13094,7 @@ M: David Airlie <airlied@linux.ie> 
M:	Gerd Hoffmann <kraxel@redhat.com>

L:	dri-devel@lists.freedesktop.org

L:	virtualization@lists.linux-foundation.org

T:	git git://git.kraxel.org/linux drm-qemu

S:	Maintained

F:	drivers/gpu/drm/virtio/

F:	include/uapi/linux/virtio_gpu.h

drivers/gpu/drm/cirrus/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -7,3 +7,12 @@ config DRM_CIRRUS_QEMU 
	 This is a KMS driver for emulated cirrus device in qemu.

	 It is *NOT* intended for real cirrus devices. This requires

	 the modesetting userspace X.org driver.



	 Cirrus is obsolete, the hardware was designed in the 90ies

	 and can't keep up with todays needs.  More background:

	 https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/



	 Better alternatives are:

	   - stdvga (DRM_BOCHS, qemu -vga std, default in qemu 2.2+)

	   - qxl (DRM_QXL, qemu -vga qxl, works best with spice)

	   - virtio (DRM_VIRTIO_GPU), qemu -vga virtio)

drivers/gpu/drm/virtio/virtgpu_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	info->fbops = &virtio_gpufb_ops;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;



	info->screen_base = obj->vmap;

	info->screen_buffer = obj->vmap;

	info->screen_size = obj->gem_base.size;

	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);

	drm_fb_helper_fill_var(info, &vfbdev->helper,