git.openwrt.org Git - openwrt/staging/jogo.git/blob

   1 From 4d220c1ad298065929dfbfa07bfb99f15e4e1c50 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Wed, 10 Apr 2019 17:35:05 +0100
   4 Subject: [PATCH 602/782] drm: vc4: Remove unused vc4_fkms_cancel_page_flip
   5  function
   6
   7 "32a3dbe drm/vc4: Nuke preclose hook" removed vc4_cancel_page_flip,
   8 but vc4_fkms_cancel_page_flip was still be added to with the
   9 fkms driver, even though it was never called.
  10 Nuke it too.
  11
  12 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  13 ---
  14  drivers/gpu/drm/vc4/vc4_drv.h          |  1 -
  15  drivers/gpu/drm/vc4/vc4_firmware_kms.c | 20 --------------------
  16  2 files changed, 21 deletions(-)
  17
  18 --- a/drivers/gpu/drm/vc4/vc4_drv.h
  19 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
  20 @@ -724,7 +724,6 @@ extern const struct dma_fence_ops vc4_fe
  21
  22  /* vc4_firmware_kms.c */
  23  extern struct platform_driver vc4_firmware_kms_driver;
  24 -void vc4_fkms_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file);
  25
  26  /* vc4_gem.c */
  27  void vc4_gem_init(struct drm_device *dev);
  28 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  29 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  30 @@ -739,26 +739,6 @@ static const struct drm_crtc_helper_func
  31         .atomic_flush = vc4_crtc_atomic_flush,
  32  };
  33
  34 -/* Frees the page flip event when the DRM device is closed with the
  35 - * event still outstanding.
  36 - */
  37 -void vc4_fkms_cancel_page_flip(struct drm_crtc *crtc, struct drm_file *file)
  38 -{
  39 -       struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
  40 -       struct drm_device *dev = crtc->dev;
  41 -       unsigned long flags;
  42 -
  43 -       spin_lock_irqsave(&dev->event_lock, flags);
  44 -
  45 -       if (vc4_crtc->event && vc4_crtc->event->base.file_priv == file) {
  46 -               kfree(&vc4_crtc->event->base);
  47 -               drm_crtc_vblank_put(crtc);
  48 -               vc4_crtc->event = NULL;
  49 -       }
  50 -
  51 -       spin_unlock_irqrestore(&dev->event_lock, flags);
  52 -}
  53 -
  54  static const struct of_device_id vc4_firmware_kms_dt_match[] = {
  55         { .compatible = "raspberrypi,rpi-firmware-kms" },
  56         {}