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

diff --combined MAINTAINERS
index c9506ea5ec2fb321c574e57a530f233ba2c79113,c36c2032742bd9222f0b80f2956179379f7a4d2f..67613185c0ff2ea4736530921140372d79782d62
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2427,6 -2427,7 +2427,6 @@@ L:      linux-security-module@vger.kernel.or
  S:    Supported
  F:    include/linux/capability.h
  F:    include/uapi/linux/capability.h
 -F:    security/capability.c
  F:    security/commoncap.c
  F:    kernel/capability.c
  
@@@ -3824,11 -3825,10 +3824,11 @@@ M:   David Woodhouse <dwmw2@infradead.org
  L:    linux-embedded@vger.kernel.org
  S:    Maintained
  
 -EMULEX LPFC FC SCSI DRIVER
 -M:    James Smart <james.smart@emulex.com>
 +EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER
 +M:    James Smart <james.smart@avagotech.com>
 +M:    Dick Kennedy <dick.kennedy@avagotech.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://sourceforge.net/projects/lpfcxxxx
 +W:    http://www.avagotech.com
  S:    Supported
  F:    drivers/scsi/lpfc/
  
@@@ -4536,7 -4536,7 +4536,7 @@@ M:      Jean Delvare <jdelvare@suse.de
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
 -T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
 +T:    quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
  F:    Documentation/hwmon/
@@@ -8829,11 -8829,9 +8829,11 @@@ F:    drivers/misc/phantom.
  F:    include/uapi/linux/phantom.h
  
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 -M:    Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
 +M:    Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
 +M:    Minh Tran <minh.tran@avagotech.com>
 +M:    John Soni Jose <sony.john-n@avagotech.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.emulex.com
 +W:    http://www.avagotech.com
  S:    Supported
  F:    drivers/scsi/be2iscsi/
  
@@@ -10571,6 -10569,15 +10571,15 @@@ F: drivers/block/virtio_blk.
  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

diff --combined drivers/gpu/drm/Makefile
index eda180d5bdffd44fbb611ad7a33fd22dedf7d73c,8e75f8194bde4e5e0a3f146635a4348be3c58506..15eb710ec11479202f7aab3621caf8378ec7b53b
--- 1/drivers/gpu/drm/Makefile
--- 2/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -58,9 -58,10 +58,10 @@@ obj-$(CONFIG_DRM_ATMEL_HLCDC)       += atmel-
  obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
  obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
  obj-$(CONFIG_DRM_OMAP)        += omapdrm/
 -obj-$(CONFIG_DRM_TILCDC)      += tilcdc/
 +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/

diff --combined drivers/gpu/drm/drm_irq.c
index 6f02b4b560b876e9a459031640f699a71142cc66,dd3fd125995016a4b593e5845ea12eb95f977ea4..f9cc68fbd2a3e18b076ad2ced71b8f1ddf002202
--- 1/drivers/gpu/drm/drm_irq.c
--- 2/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@@ -130,7 -130,7 +130,7 @@@ static void drm_update_vblank_count(str
        /*
         * Interrupts were disabled prior to this call, so deal with counter
         * wrap if needed.
 -       * NOTE!  It's possible we lost a full dev->max_vblank_count events
 +       * NOTE!  It's possible we lost a full dev->max_vblank_count + 1 events
         * here if the register is small or we had vblank interrupts off for
         * a long time.
         *
@@@ -147,7 -147,7 +147,7 @@@
        /* Deal with counter wrap */
        diff = cur_vblank - vblank->last;
        if (cur_vblank < vblank->last) {
 -              diff += dev->max_vblank_count;
 +              diff += dev->max_vblank_count + 1;
  
                DRM_DEBUG("last_vblank[%d]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
                          crtc, vblank->last, cur_vblank, diff);
@@@ -1056,6 -1056,9 +1056,9 @@@ int drm_vblank_get(struct drm_device *d
        unsigned long irqflags;
        int ret = 0;
  
+       if (!dev->num_crtcs)
+               return -EINVAL;
+ 
        if (WARN_ON(crtc >= dev->num_crtcs))
                return -EINVAL;
  

diff --combined include/drm/drmP.h
index 9fa6366f47c20a531e35d22bfcdba99d7175b638,59ce5587ed9092d87152fe7599fc094bd8887629..48db6a56975f5ebc874d19054828b70a5f4aaa15
--- 1/include/drm/drmP.h
--- 2/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@@ -326,10 -326,6 +326,10 @@@ struct drm_file 
        struct list_head fbs;
        struct mutex fbs_lock;
  
 +      /** User-created blob properties; this retains a reference on the
 +       *  property. */
 +      struct list_head blobs;
 +
        wait_queue_head_t event_wait;
        struct list_head event_list;
        int event_space;
@@@ -818,6 -814,7 +818,7 @@@ struct drm_device 
  #endif
  
        struct platform_device *platformdev; /**< Platform device struture */
+       struct virtio_device *virtdev;
  
        struct drm_sg_mem *sg;  /**< Scatter gather memory */
        unsigned int num_crtcs;                  /**< Number of CRTCs on this device */