iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm-qemu: virtio sparse fix, MAINTAINERS updates.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJYdPRkAAoJEEy22O7T6HE4HGQQAK6JIKhMgOVoHbpnYvg3F3RC
 kdUkLMPc1b3dporxHwnF+vsvfnXxE8+qm79r9apllvOGYUhi/AMRnKFXyNS5iCYE
 GPODXLcwrI4n3qkb86nyzmKZev/FD33+1pCK62w/ASqwnddzKrWa2On24XXNysND
 yD1vvK60OP00/sR11uhF2qqCT/TGqMI4mD71HrK2LbCKbFey0CbiY3modQUI2HJd
 rsm/4cfIKntenRT7NWFjDDRURUUL1KU+hx2JFFO125aAz1OjakR4V4yfz5DN1p3J
 oWJTBbj1xb1snucegyVM1LJDqIQSvbOqZPb3suCxug8s0gaqRJIUg589qotBaD8t
 CosCvgUh8psFFuHaWMFIqo6pm7eaFfVYAVQOL4Nn/n2ctUEsNxU4atGI2Aflqxj6
 Px4J82xXm+/sTHFeVDSxyDAf0SSQKWR/jv8JrijXg7nguZb+L+u8lz5/1xzkH5r4
 aI/q9CT5yJ3BkwH+Su3uBI8Ccn/73Cg96sXNX2oDSIEEmgJW4YHkEXfdK6YqAkDG
 q42E14jG6BHJc5k/O/GiRQMO6KkUfxupIA5A2x8ysb46Sv+Qmc15lC+hABYCuwWV
 17RPJ/s6sJR2C5H/r+VNbVJ/eizrGFf8JSGPBoj/7XGDsocXlkCXbkKaqKoZyLoM
 j8Lby17Fx6PMfEUeQnQ8
 =+MaC
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Dave Airlie 2017-01-23 09:25:53 +10:00
commit 932790109f
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MAINTAINERS
View File

@ -4106,12 +4106,18 @@ F: drivers/gpu/drm/bridge/
DRM DRIVER FOR BOCHS VIRTUAL GPU DRM DRIVER FOR BOCHS VIRTUAL GPU
M: Gerd Hoffmann <kraxel@redhat.com> 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/ F: drivers/gpu/drm/bochs/
DRM DRIVER FOR QEMU'S CIRRUS DEVICE DRM DRIVER FOR QEMU'S CIRRUS DEVICE
M: Dave Airlie <airlied@redhat.com> 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/ F: drivers/gpu/drm/cirrus/
RADEON and AMDGPU DRM DRIVERS RADEON and AMDGPU DRM DRIVERS
@ -4304,7 +4310,10 @@ F: Documentation/devicetree/bindings/display/renesas,du.txt
DRM DRIVER FOR QXL VIRTUAL GPU DRM DRIVER FOR QXL VIRTUAL GPU
M: Dave Airlie <airlied@redhat.com> 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: drivers/gpu/drm/qxl/
F: include/uapi/drm/qxl_drm.h F: include/uapi/drm/qxl_drm.h
@ -13085,6 +13094,7 @@ M: David Airlie <airlied@linux.ie>
M: Gerd Hoffmann <kraxel@redhat.com> M: Gerd Hoffmann <kraxel@redhat.com>
L: dri-devel@lists.freedesktop.org L: dri-devel@lists.freedesktop.org
L: virtualization@lists.linux-foundation.org L: virtualization@lists.linux-foundation.org
T: git git://git.kraxel.org/linux drm-qemu
S: Maintained S: Maintained
F: drivers/gpu/drm/virtio/ F: drivers/gpu/drm/virtio/
F: include/uapi/linux/virtio_gpu.h F: include/uapi/linux/virtio_gpu.h

9
drivers/gpu/drm/cirrus/Kconfig
View File

@ -7,3 +7,12 @@ config DRM_CIRRUS_QEMU
This is a KMS driver for emulated cirrus device in qemu. This is a KMS driver for emulated cirrus device in qemu.
It is *NOT* intended for real cirrus devices. This requires It is *NOT* intended for real cirrus devices. This requires
the modesetting userspace X.org driver. 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)

2
drivers/gpu/drm/virtio/virtgpu_fb.c
View File

@ -331,7 +331,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
info->fbops = &virtio_gpufb_ops; info->fbops = &virtio_gpufb_ops;
info->pixmap.flags = FB_PIXMAP_SYSTEM; info->pixmap.flags = FB_PIXMAP_SYSTEM;
info->screen_base = obj->vmap; info->screen_buffer = obj->vmap;
info->screen_size = obj->gem_base.size; info->screen_size = obj->gem_base.size;
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth); drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
drm_fb_helper_fill_var(info, &vfbdev->helper, drm_fb_helper_fill_var(info, &vfbdev->helper,