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

Commit 63e14561 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next 

Yay, thanks to Gerd for pull this together.

* 'virtio-gpu-drm-next' of git://git.kraxel.org/linux:
  Add MAINTAINERS entry for virtio-gpu.
  Add virtio gpu driver.
  drm_vblank_get: don't WARN_ON in case vblanks are not initialized
  break kconfig dependency loop
parents 6aa62725 4ad6ee91

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -10571,6 +10571,15 @@ F: drivers/block/virtio_blk.c 
F:	include/linux/virtio_*.h

F:	include/uapi/linux/virtio_*.h



VIRTIO GPU DRIVER

M:	David Airlie <airlied@linux.ie>

M:	Gerd Hoffmann <kraxel@redhat.com>

L:	dri-devel@lists.freedesktop.org

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/gpu/drm/virtio/

F:	include/uapi/linux/virtio_gpu.h



VIRTIO HOST (VHOST)

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	kvm@vger.kernel.org

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ source "drivers/gpu/drm/qxl/Kconfig" 


source "drivers/gpu/drm/bochs/Kconfig"



source "drivers/gpu/drm/virtio/Kconfig"



source "drivers/gpu/drm/msm/Kconfig"



source "drivers/gpu/drm/tegra/Kconfig"

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ obj-$(CONFIG_DRM_OMAP) += omapdrm/ 
obj-y			+= tilcdc/

obj-$(CONFIG_DRM_QXL) += qxl/

obj-$(CONFIG_DRM_BOCHS) += bochs/

obj-$(CONFIG_DRM_VIRTIO_GPU) += virtio/

obj-$(CONFIG_DRM_MSM) += msm/

obj-$(CONFIG_DRM_TEGRA) += tegra/

obj-$(CONFIG_DRM_STI) += sti/

drivers/gpu/drm/drm_irq.c

+3 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,9 @@ int drm_vblank_get(struct drm_device *dev, int crtc) 
	unsigned long irqflags;

	int ret = 0;



	if (!dev->num_crtcs)

		return -EINVAL;



	if (WARN_ON(crtc >= dev->num_crtcs))

		return -EINVAL;

drivers/gpu/drm/virtio/Kconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
config DRM_VIRTIO_GPU

	tristate "Virtio GPU driver"

	depends on DRM && VIRTIO

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

        select DRM_KMS_HELPER

        select DRM_KMS_FB_HELPER

        select DRM_TTM

	help

	   This is the virtual GPU driver for virtio.  It can be used with

           QEMU based VMMs (like KVM or Xen).



	   If unsure say M.