drm: Make vblank_enabled bool

vblank_enabled is only ever 0 or 1, so make it a bool.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 81b4c84449a410b729bfb2dde70660f3c44bea10..49680a8ab96aeb188b23a333028161db6c31830e 100644 (file)
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -115,7 +115,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
        spin_lock_irqsave(&dev->vblank_time_lock, irqflags);
 
        dev->driver->disable_vblank(dev, crtc);
-       dev->vblank_enabled[crtc] = 0;
+       dev->vblank_enabled[crtc] = false;
 
        /* No further vblank irq's will be processed after
         * this point. Get current hardware vblank count and
@@ -235,7 +235,7 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
        if (!dev->vblank_refcount)
                goto err;
 
-       dev->vblank_enabled = kcalloc(num_crtcs, sizeof(int), GFP_KERNEL);
+       dev->vblank_enabled = kcalloc(num_crtcs, sizeof(bool), GFP_KERNEL);
        if (!dev->vblank_enabled)
                goto err;
 
@@ -412,7 +412,7 @@ int drm_irq_uninstall(struct drm_device *dev)
                spin_lock_irqsave(&dev->vbl_lock, irqflags);
                for (i = 0; i < dev->num_crtcs; i++) {
                        DRM_WAKEUP(&dev->vbl_queue[i]);
-                       dev->vblank_enabled[i] = 0;
+                       dev->vblank_enabled[i] = false;
                        dev->last_vblank[i] =
                                dev->driver->get_vblank_counter(dev, i);
                }
@@ -973,7 +973,7 @@ int drm_vblank_get(struct drm_device *dev, int crtc)
                        if (ret)
                                atomic_dec(&dev->vblank_refcount[crtc]);
                        else {
-                               dev->vblank_enabled[crtc] = 1;
+                               dev->vblank_enabled[crtc] = true;
                                drm_update_vblank_count(dev, crtc);
                        }
                }

diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c
index 9263db117ff8ae937dbf743ac0e8a267264d95a4..3cbe92c72fd507e36eafa104df20121a6bbd528f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_irq.c
+++ b/drivers/gpu/drm/omapdrm/omap_irq.c
@@ -308,7 +308,7 @@ int omap_drm_irq_uninstall(struct drm_device *dev)
                spin_lock_irqsave(&dev->vbl_lock, irqflags);
                for (i = 0; i < dev->num_crtcs; i++) {
                        DRM_WAKEUP(&dev->vbl_queue[i]);
-                       dev->vblank_enabled[i] = 0;
+                       dev->vblank_enabled[i] = false;
                        dev->last_vblank[i] =
                                dev->driver->get_vblank_counter(dev, i);
                }

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index e73809b380f8b14bd354146ed056ae0bcbe08631..2d390abbf55090d75a93dbbadd76bdd3ba8a54d8 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1161,7 +1161,7 @@ struct drm_device {
        atomic_t *vblank_refcount;      /* number of users of vblank interruptsper crtc */
        u32 *last_vblank;               /* protected by dev->vbl_lock, used */
                                        /* for wraparound handling */
-       int *vblank_enabled;            /* so we don't call enable more than
+       bool *vblank_enabled;           /* so we don't call enable more than
                                           once per disable */
        unsigned int *vblank_inmodeset; /* Display driver is setting mode */
        u32 *last_vblank_wait;          /* Last vblank seqno waited per CRTC */