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

Commit 57ed0f7b authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE 



Less yelling ftw!

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e9f0d76f

drivers/gpu/drm/drm_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ int drm_irq_uninstall(struct drm_device *dev) 
	if (dev->num_crtcs) {

		spin_lock_irqsave(&dev->vbl_lock, irqflags);

		for (i = 0; i < dev->num_crtcs; i++) {

			DRM_WAKEUP(&dev->vblank[i].queue);

			wake_up(&dev->vblank[i].queue);

			dev->vblank[i].enabled = false;

			dev->vblank[i].last =

				dev->driver->get_vblank_counter(dev, i);
@@ -980,7 +980,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc) 


	spin_lock_irqsave(&dev->vbl_lock, irqflags);

	vblank_disable_and_save(dev, crtc);

	DRM_WAKEUP(&dev->vblank[crtc].queue);

	wake_up(&dev->vblank[crtc].queue);



	/* Send any queued vblank events, lest the natives grow disquiet */

	seq = drm_vblank_count_and_time(dev, crtc, &now);
@@ -1363,7 +1363,7 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc) 
			  crtc, (int) diff_ns);

	}



	DRM_WAKEUP(&dev->vblank[crtc].queue);

	wake_up(&dev->vblank[crtc].queue);

	drm_handle_vblank_events(dev, crtc);



	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ static int fimd_probe(struct platform_device *pdev) 
	}



	ctx->driver_data = drm_fimd_get_driver_data(pdev);

	DRM_INIT_WAITQUEUE(&ctx->wait_vsync_queue);

	init_waitqueue_head(&ctx->wait_vsync_queue);

	atomic_set(&ctx->wait_vsync_event, 0);



	subdrv = &ctx->subdrv;

drivers/gpu/drm/exynos/exynos_mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg) 
		/* set wait vsync event to zero and wake up queue. */

		if (atomic_read(&ctx->wait_vsync_event)) {

			atomic_set(&ctx->wait_vsync_event, 0);

			DRM_WAKEUP(&ctx->wait_vsync_queue);

			wake_up(&ctx->wait_vsync_queue);

		}

	}
@@ -1209,7 +1209,7 @@ static int mixer_probe(struct platform_device *pdev) 
	drm_hdmi_ctx->ctx = (void *)ctx;

	ctx->vp_enabled = drv->is_vp_enabled;

	ctx->mxr_ver = drv->version;

	DRM_INIT_WAITQUEUE(&ctx->wait_vsync_queue);

	init_waitqueue_head(&ctx->wait_vsync_queue);

	atomic_set(&ctx->wait_vsync_event, 0);



	platform_set_drvdata(pdev, drm_hdmi_ctx);

drivers/gpu/drm/mga/mga_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg) 
			MGA_WRITE(MGA_PRIMEND, prim_end);



		atomic_inc(&dev_priv->last_fence_retired);

		DRM_WAKEUP(&dev_priv->fence_queue);

		wake_up(&dev_priv->fence_queue);

		handled = 1;

	}
@@ -151,7 +151,7 @@ int mga_driver_irq_postinstall(struct drm_device *dev) 
{

	drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;



	DRM_INIT_WAITQUEUE(&dev_priv->fence_queue);

	init_waitqueue_head(&dev_priv->fence_queue);



	/* Turn on soft trap interrupt.  Vertical blank interrupts are enabled

	 * in mga_enable_vblank.

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) 
	if (dev->num_crtcs) {

		spin_lock_irqsave(&dev->vbl_lock, irqflags);

		for (i = 0; i < dev->num_crtcs; i++) {

			DRM_WAKEUP(&dev->vblank[i].queue);

			wake_up(&dev->vblank[i].queue);

			dev->vblank[i].enabled = false;

			dev->vblank[i].last =

				dev->driver->get_vblank_counter(dev, i);