On Mon, 11 Jan 2016 22:41:06 +0100
Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> The only thing this did was cancle pending flip events, and the core
> takes care of that now.
>
> Cc: Boris Brezillon <boris.brezillon at free-electrons.com>
> Acked-by: Daniel Stone <daniels at collabora.com>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Acked-by: Boris Brezillon <boris.brezillon at free-electrons.com>
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 ------------------
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 10 ----------
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 3 ---
> 3 files changed, 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> index 468a14f266a7..9863291a9a54 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> @@ -280,24 +280,6 @@ static void atmel_hlcdc_crtc_destroy(struct drm_crtc *c)
> kfree(crtc);
> }
>
> -void atmel_hlcdc_crtc_cancel_page_flip(struct drm_crtc *c,
> - struct drm_file *file)
> -{
> - struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
> - struct drm_pending_vblank_event *event;
> - struct drm_device *dev = c->dev;
> - unsigned long flags;
> -
> - spin_lock_irqsave(&dev->event_lock, flags);
> - event = crtc->event;
> - if (event && event->base.file_priv == file) {
> - event->base.destroy(&event->base);
> - drm_vblank_put(dev, crtc->id);
> - crtc->event = NULL;
> - }
> - spin_unlock_irqrestore(&dev->event_lock, flags);
> -}
> -
> static void atmel_hlcdc_crtc_finish_page_flip(struct atmel_hlcdc_crtc *crtc)
> {
> struct drm_device *dev = crtc->base.dev;
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
> b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
> index a45b32ba029e..3d8d16402d07 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
> @@ -619,15 +619,6 @@ static void atmel_hlcdc_dc_connector_unplug_all(struct
> drm_device *dev)
> mutex_unlock(&dev->mode_config.mutex);
> }
>
> -static void atmel_hlcdc_dc_preclose(struct drm_device *dev,
> - struct drm_file *file)
> -{
> - struct drm_crtc *crtc;
> -
> - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
> - atmel_hlcdc_crtc_cancel_page_flip(crtc, file);
> -}
> -
> static void atmel_hlcdc_dc_lastclose(struct drm_device *dev)
> {
> struct atmel_hlcdc_dc *dc = dev->dev_private;
> @@ -698,7 +689,6 @@ static struct drm_driver atmel_hlcdc_dc_driver = {
> .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM |
> DRIVER_MODESET | DRIVER_PRIME |
> DRIVER_ATOMIC,
> - .preclose = atmel_hlcdc_dc_preclose,
> .lastclose = atmel_hlcdc_dc_lastclose,
> .irq_handler = atmel_hlcdc_dc_irq_handler,
> .irq_preinstall = atmel_hlcdc_dc_irq_uninstall,
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
> b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
> index cf6b375bc38d..fed517f297da 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
> @@ -152,9 +152,6 @@ int atmel_hlcdc_plane_prepare_disc_area(struct
> drm_crtc_state *c_state);
>
> void atmel_hlcdc_crtc_irq(struct drm_crtc *c);
>
> -void atmel_hlcdc_crtc_cancel_page_flip(struct drm_crtc *crtc,
> - struct drm_file *file);
> -
> void atmel_hlcdc_crtc_suspend(struct drm_crtc *crtc);
> void atmel_hlcdc_crtc_resume(struct drm_crtc *crtc);
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
