target/linux/bcm27xx/patches-4.19/950-0115-vc4_firmware_kms-fix-build.patch

   1 From 8b9843afd665a52df07cc804d6fcb624b22cd85e 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 | 6 ++++--
   8  1 file changed, 4 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 @@ -33,6 +33,8 @@
  13  #define SMICS 0x0
  14  #define SMICS_INTERRUPTS (BIT(9) | BIT(10) | BIT(11))
  15
  16 +#define vc4_crtc vc4_kms_crtc
  17 +#define to_vc4_crtc to_vc4_kms_crtc
  18  struct vc4_crtc {
  19         struct drm_crtc base;
  20         struct drm_encoder *encoder;
  21 @@ -273,7 +275,7 @@ static int vc4_plane_atomic_check(struct
  22
  23  static void vc4_plane_destroy(struct drm_plane *plane)
  24  {
  25 -       drm_plane_helper_disable(plane);
  26 +       drm_plane_helper_disable(plane, NULL);
  27         drm_plane_cleanup(plane);
  28  }
  29
  30 @@ -591,7 +593,7 @@ static struct drm_connector *vc4_fkms_co
  31         connector->interlace_allowed = 0;
  32         connector->doublescan_allowed = 0;
  33
  34 -       drm_mode_connector_attach_encoder(connector, encoder);
  35 +       drm_connector_attach_encoder(connector, encoder);
  36
  37         return connector;
  38