From 6885af169f6eeb386f410e556029c6518c6b67b2 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 10 Apr 2019 17:35:05 +0100 Subject: [PATCH] drm: vc4: Remove unused vc4_fkms_cancel_page_flip function "32a3dbe drm/vc4: Nuke preclose hook" removed vc4_cancel_page_flip, but vc4_fkms_cancel_page_flip was still be added to with the fkms driver, even though it was never called. Nuke it too. Signed-off-by: Dave Stevenson --- drivers/gpu/drm/vc4/vc4_drv.h | 1 - drivers/gpu/drm/vc4/vc4_firmware_kms.c | 20 -------------------- 2 files changed, 21 deletions(-) --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -724,7 +724,6 @@ extern const struct dma_fence_ops vc4_fe /* vc4_firmware_kms.c */ extern struct platform_driver vc4_firmware_kms_driver; -void vc4_fkms_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file); /* vc4_gem.c */ void vc4_gem_init(struct drm_device *dev); --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -739,26 +739,6 @@ static const struct drm_crtc_helper_func .atomic_flush = vc4_crtc_atomic_flush, }; -/* Frees the page flip event when the DRM device is closed with the - * event still outstanding. - */ -void vc4_fkms_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file) -{ - struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - struct drm_device *dev = crtc->dev; - unsigned long flags; - - spin_lock_irqsave(&dev->event_lock, flags); - - if (vc4_crtc->event && vc4_crtc->event->base.file_priv == file) { - kfree(&vc4_crtc->event->base); - drm_crtc_vblank_put(crtc); - vc4_crtc->event = NULL; - } - - spin_unlock_irqrestore(&dev->event_lock, flags); -} - static const struct of_device_id vc4_firmware_kms_dt_match[] = { { .compatible = "raspberrypi,rpi-firmware-kms" }, {}