target/linux/bcm27xx/patches-5.4/950-0106-vc4_firmware_kms-fix-build.patch

   1 From 9e8086c8bd92ea746d42a26ec376b31caf9e3395 Mon Sep 17 00:00:00 2001
   2 From: popcornmix <popcornmix@gmail.com>
   3 Date: Sun, 17 Jun 2018 13:22:07 +0100
   4 Subject: [PATCH] vc4_firmware_kms: fix build
   5
   6 ---
   7  drivers/gpu/drm/vc4/vc4_firmware_kms.c | 8 ++++++--
   8  1 file changed, 6 insertions(+), 2 deletions(-)
   9
  10 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  11 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  12 @@ -18,6 +18,7 @@
  13  #include "drm/drm_plane_helper.h"
  14  #include "drm/drm_crtc_helper.h"
  15  #include "drm/drm_fourcc.h"
  16 +#include "drm/drm_probe_helper.h"
  17  #include "linux/clk.h"
  18  #include "linux/debugfs.h"
  19  #include "drm/drm_fb_cma_helper.h"
  20 @@ -33,6 +34,8 @@
  21  #define SMICS 0x0
  22  #define SMICS_INTERRUPTS (BIT(9) | BIT(10) | BIT(11))
  23
  24 +#define vc4_crtc vc4_kms_crtc
  25 +#define to_vc4_crtc to_vc4_kms_crtc
  26  struct vc4_crtc {
  27         struct drm_crtc base;
  28         struct drm_encoder *encoder;
  29 @@ -273,7 +276,6 @@ static int vc4_plane_atomic_check(struct
  30
  31  static void vc4_plane_destroy(struct drm_plane *plane)
  32  {
  33 -       drm_plane_helper_disable(plane);
  34         drm_plane_cleanup(plane);
  35  }
  36
  37 @@ -591,7 +593,7 @@ static struct drm_connector *vc4_fkms_co
  38         connector->interlace_allowed = 0;
  39         connector->doublescan_allowed = 0;
  40
  41 -       drm_mode_connector_attach_encoder(connector, encoder);
  42 +       drm_connector_attach_encoder(connector, encoder);
  43
  44         return connector;
  45
  46 @@ -734,11 +736,13 @@ err:
  47  static void vc4_fkms_unbind(struct device *dev, struct device *master,
  48                             void *data)
  49  {
  50 +       struct drm_device *drm = dev_get_drvdata(master);
  51         struct platform_device *pdev = to_platform_device(dev);
  52         struct vc4_crtc *vc4_crtc = dev_get_drvdata(dev);
  53
  54         vc4_fkms_connector_destroy(vc4_crtc->connector);
  55         vc4_fkms_encoder_destroy(vc4_crtc->encoder);
  56 +       drm_atomic_helper_shutdown(drm);
  57         drm_crtc_cleanup(&vc4_crtc->base);
  58
  59         platform_set_drvdata(pdev, NULL);