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

Commit b19ac0b0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/tilcdc: Nuke preclose hook 



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

v2: Fixup misplaced hunks.

Cc: Rob Clark <robdclark@gmail.com>
Acked-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453756616-28942-13-git-send-email-daniel.vetter@ffwll.ch
parent 0417d424

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

+0 −20
Original line number Diff line number Diff line
@@ -662,26 +662,6 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc) 
	return IRQ_HANDLED;

}



void tilcdc_crtc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file)

{

	struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);

	struct drm_pending_vblank_event *event;

	struct drm_device *dev = 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 = tilcdc_crtc->event;

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

		tilcdc_crtc->event = NULL;

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

		drm_vblank_put(dev, 0);

	}

	spin_unlock_irqrestore(&dev->event_lock, flags);

}



struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)

{

	struct tilcdc_crtc *tilcdc_crtc;

drivers/gpu/drm/tilcdc/tilcdc_drv.c

+0 −8
Original line number Diff line number Diff line
@@ -350,13 +350,6 @@ static int tilcdc_load(struct drm_device *dev, unsigned long flags) 
	return ret;

}



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

{

	struct tilcdc_drm_private *priv = dev->dev_private;



	tilcdc_crtc_cancel_page_flip(priv->crtc, file);

}



static void tilcdc_lastclose(struct drm_device *dev)

{

	struct tilcdc_drm_private *priv = dev->dev_private;
@@ -557,7 +550,6 @@ static struct drm_driver tilcdc_driver = { 
	.driver_features    = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET,

	.load               = tilcdc_load,

	.unload             = tilcdc_unload,

	.preclose           = tilcdc_preclose,

	.lastclose          = tilcdc_lastclose,

	.set_busid          = drm_platform_set_busid,

	.irq_handler        = tilcdc_irq,

drivers/gpu/drm/tilcdc/tilcdc_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ struct tilcdc_panel_info { 
#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)



struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev);

void tilcdc_crtc_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file);

irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc);

void tilcdc_crtc_update_clk(struct drm_crtc *crtc);

void tilcdc_crtc_set_panel_info(struct drm_crtc *crtc,