1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 77f357b2c386..c0c3f2006203 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -482,7 +482,7 @@ int drm_irq_install(struct drm_device *dev, int irq)
                 return ret;
         }
 
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
+        if (drm_core_check_feature(dev, DRIVER_LEGACY))
                 vga_client_register(dev->pdev, (void *)dev, drm_irq_vgaarb_nokms, NULL);
 
         /* After installing handler */
@@ -491,7 +491,7 @@ int drm_irq_install(struct drm_device *dev, int irq)
 
         if (ret < 0) {
                 dev->irq_enabled = false;
-                if (!drm_core_check_feature(dev, DRIVER_MODESET))
+                if (drm_core_check_feature(dev, DRIVER_LEGACY))
                         vga_client_register(dev->pdev, NULL, NULL, NULL);
                 free_irq(irq, dev);
         } else {
@@ -557,7 +557,7 @@ int drm_irq_uninstall(struct drm_device *dev)
 
         DRM_DEBUG("irq=%d\n", dev->irq);
 
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
+        if (drm_core_check_feature(dev, DRIVER_LEGACY))
                 vga_client_register(dev->pdev, NULL, NULL, NULL);
 
         if (dev->driver->irq_uninstall)
@@ -592,7 +592,7 @@ int drm_control(struct drm_device *dev, void *data,
 
         if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                 return 0;
-        if (drm_core_check_feature(dev, DRIVER_MODESET))
+        if (!drm_core_check_feature(dev, DRIVER_LEGACY))
                 return 0;
         /* UMS was only ever supported on pci devices. */
         if (WARN_ON(!dev->pdev))
@@ -1295,7 +1295,7 @@ void drm_vblank_off(struct drm_device *dev, unsigned int pipe)
                 if (e->pipe != pipe)
                         continue;
                 DRM_DEBUG("Sending premature vblank event on disable: "
-                          "wanted %d, current %d\n",
+                          "wanted %u, current %u\n",
                           e->event.sequence, seq);
                 list_del(&e->base.link);
                 drm_vblank_put(dev, pipe);
@@ -1519,7 +1519,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
                 return 0;
 
         /* KMS drivers handle this internally */
-        if (drm_core_check_feature(dev, DRIVER_MODESET))
+        if (!drm_core_check_feature(dev, DRIVER_LEGACY))
                 return 0;
 
         pipe = modeset->crtc;
@@ -1585,7 +1585,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
 
         seq = drm_vblank_count_and_time(dev, pipe, &now);
 
-        DRM_DEBUG("event on vblank count %d, current %d, crtc %u\n",
+        DRM_DEBUG("event on vblank count %u, current %u, crtc %u\n",
                   vblwait->request.sequence, seq, pipe);
 
         trace_drm_vblank_event_queued(current->pid, pipe,
@@ -1693,7 +1693,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
                 return drm_queue_vblank_event(dev, pipe, vblwait, file_priv);
         }
 
-        DRM_DEBUG("waiting on vblank count %d, crtc %u\n",
+        DRM_DEBUG("waiting on vblank count %u, crtc %u\n",
                   vblwait->request.sequence, pipe);
         DRM_WAIT_ON(ret, vblank->queue, 3 * HZ,
                     (((drm_vblank_count(dev, pipe) -
@@ -1708,7 +1708,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
                 vblwait->reply.tval_sec = now.tv_sec;
                 vblwait->reply.tval_usec = now.tv_usec;
 
-                DRM_DEBUG("returning %d to client\n",
+                DRM_DEBUG("returning %u to client\n",
                           vblwait->reply.sequence);
         } else {
                 DRM_DEBUG("vblank wait interrupted by signal\n");
@@ -1735,7 +1735,7 @@ static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
                 if ((seq - e->event.sequence) > (1<<23))
                         continue;
 
-                DRM_DEBUG("vblank event on %d, current %d\n",
+                DRM_DEBUG("vblank event on %u, current %u\n",
                           e->event.sequence, seq);
 
                 list_del(&e->base.link);
@@ -1826,6 +1826,7 @@ EXPORT_SYMBOL(drm_crtc_handle_vblank);
  */
 u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe)
 {
+        WARN_ON_ONCE(dev->max_vblank_count != 0);
         return 0;
 }
 EXPORT_SYMBOL(drm_vblank_no_hw_counter);