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

Commit bf507d90 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie
Browse files

drm: Make vblank_enabled bool 



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

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 54edf9ae

drivers/gpu/drm/drm_irq.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

			}

		}

drivers/gpu/drm/omapdrm/omap_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

		}

include/drm/drmP.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */