target/linux/bcm27xx/patches-5.4/950-0566-drm-vc4-crtc-Rename-HDMI-encoder-type-to-HDMI0.patch

   1 From ad4c39a27e141626c93b7b97df621d258bfdcbbe Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Thu, 9 Jan 2020 18:35:13 +0100
   4 Subject: [PATCH] drm/vc4: crtc: Rename HDMI encoder type to HDMI0
   5
   6 The previous generations were only supporting a single HDMI controller, but
   7 that's about to change, so put an index as well to differentiate between
   8 the two controllers.
   9
  10 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
  13  drivers/gpu/drm/vc4/vc4_drv.h  | 2 +-
  14  drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
  15  3 files changed, 3 insertions(+), 3 deletions(-)
  16
  17 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
  18 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
  19 @@ -1110,7 +1110,7 @@ static const struct vc4_crtc_data bcm283
  20         .fifo_depth = 64,
  21         .pixels_per_clock = 1,
  22         .encoder_types = {
  23 -               [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI,
  24 +               [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI0,
  25                 [PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,
  26         },
  27  };
  28 --- a/drivers/gpu/drm/vc4/vc4_drv.h
  29 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
  30 @@ -431,7 +431,7 @@ to_vc4_plane_state(struct drm_plane_stat
  31
  32  enum vc4_encoder_type {
  33         VC4_ENCODER_TYPE_NONE,
  34 -       VC4_ENCODER_TYPE_HDMI,
  35 +       VC4_ENCODER_TYPE_HDMI0,
  36         VC4_ENCODER_TYPE_VEC,
  37         VC4_ENCODER_TYPE_DSI0,
  38         VC4_ENCODER_TYPE_DSI1,
  39 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  40 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  41 @@ -1319,7 +1319,7 @@ static int vc4_hdmi_bind(struct device *
  42                                         GFP_KERNEL);
  43         if (!vc4_hdmi_encoder)
  44                 return -ENOMEM;
  45 -       vc4_hdmi_encoder->base.type = VC4_ENCODER_TYPE_HDMI;
  46 +       vc4_hdmi_encoder->base.type = VC4_ENCODER_TYPE_HDMI0;
  47         hdmi->encoder = &vc4_hdmi_encoder->base.base;
  48
  49         hdmi->pdev = pdev;