50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From ad4c39a27e141626c93b7b97df621d258bfdcbbe Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 9 Jan 2020 18:35:13 +0100
|
|
Subject: [PATCH] drm/vc4: crtc: Rename HDMI encoder type to HDMI0
|
|
|
|
The previous generations were only supporting a single HDMI controller, but
|
|
that's about to change, so put an index as well to differentiate between
|
|
the two controllers.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 2 +-
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -1110,7 +1110,7 @@ static const struct vc4_crtc_data bcm283
|
|
.fifo_depth = 64,
|
|
.pixels_per_clock = 1,
|
|
.encoder_types = {
|
|
- [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI,
|
|
+ [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI0,
|
|
[PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,
|
|
},
|
|
};
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -431,7 +431,7 @@ to_vc4_plane_state(struct drm_plane_stat
|
|
|
|
enum vc4_encoder_type {
|
|
VC4_ENCODER_TYPE_NONE,
|
|
- VC4_ENCODER_TYPE_HDMI,
|
|
+ VC4_ENCODER_TYPE_HDMI0,
|
|
VC4_ENCODER_TYPE_VEC,
|
|
VC4_ENCODER_TYPE_DSI0,
|
|
VC4_ENCODER_TYPE_DSI1,
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1320,7 +1320,7 @@ static int vc4_hdmi_bind(struct device *
|
|
GFP_KERNEL);
|
|
if (!vc4_hdmi_encoder)
|
|
return -ENOMEM;
|
|
- vc4_hdmi_encoder->base.type = VC4_ENCODER_TYPE_HDMI;
|
|
+ vc4_hdmi_encoder->base.type = VC4_ENCODER_TYPE_HDMI0;
|
|
hdmi->encoder = &vc4_hdmi_encoder->base.base;
|
|
|
|
hdmi->pdev = pdev;
|