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

Commit 0a346629 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/rcar: Nuke preclose hook 



Again since the drm core takes care of event unlinking/disarming this
is now just needless code.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453756616-28942-10-git-send-email-daniel.vetter@ffwll.ch
parent 8c04fdee

drivers/gpu/drm/rcar-du/rcar_du_crtc.c

+0 −20
Original line number Diff line number Diff line
@@ -282,26 +282,6 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc) 
 * Page Flip

 */



void rcar_du_crtc_cancel_page_flip(struct rcar_du_crtc *rcrtc,

				   struct drm_file *file)

{

	struct drm_pending_vblank_event *event;

	struct drm_device *dev = rcrtc->crtc.dev;

	unsigned long flags;



	/* Destroy the pending vertical blanking event associated with the

	 * pending page flip, if any, and disable vertical blanking interrupts.

	 */

	spin_lock_irqsave(&dev->event_lock, flags);

	event = rcrtc->event;

	if (event && event->base.file_priv == file) {

		rcrtc->event = NULL;

		event->base.destroy(&event->base);

		drm_crtc_vblank_put(&rcrtc->crtc);

	}

	spin_unlock_irqrestore(&dev->event_lock, flags);

}



static void rcar_du_crtc_finish_page_flip(struct rcar_du_crtc *rcrtc)

{

	struct drm_pending_vblank_event *event;

drivers/gpu/drm/rcar-du/rcar_du_crtc.h

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ enum rcar_du_output { 


int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index);

void rcar_du_crtc_enable_vblank(struct rcar_du_crtc *rcrtc, bool enable);

void rcar_du_crtc_cancel_page_flip(struct rcar_du_crtc *rcrtc,

				   struct drm_file *file);

void rcar_du_crtc_suspend(struct rcar_du_crtc *rcrtc);

void rcar_du_crtc_resume(struct rcar_du_crtc *rcrtc);

drivers/gpu/drm/rcar-du/rcar_du_drv.c

+0 −10
Original line number Diff line number Diff line
@@ -220,15 +220,6 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags) 
	return ret;

}



static void rcar_du_preclose(struct drm_device *dev, struct drm_file *file)

{

	struct rcar_du_device *rcdu = dev->dev_private;

	unsigned int i;



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

		rcar_du_crtc_cancel_page_flip(&rcdu->crtcs[i], file);

}



static void rcar_du_lastclose(struct drm_device *dev)

{

	struct rcar_du_device *rcdu = dev->dev_private;
@@ -271,7 +262,6 @@ static struct drm_driver rcar_du_driver = { 
				| DRIVER_ATOMIC,

	.load			= rcar_du_load,

	.unload			= rcar_du_unload,

	.preclose		= rcar_du_preclose,

	.lastclose		= rcar_du_lastclose,

	.set_busid		= drm_platform_set_busid,

	.get_vblank_counter	= drm_vblank_no_hw_counter,