leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/vc4: crtc: Rename HDMI encoder type to HDMI0

Browse Source 
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>
Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/84e11e4793aaa30d6e5c56e305d22404ac5a932d.1599120059.git-series.maxime@cerno.tech
This commit is contained in:
Maxime Ripard 2020-09-03 10:00:49 +02:00
parent 62c5d55e25
commit ed024b229d
No known key found for this signature in database
GPG Key ID: E3EF0D6F671851C5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/vc4/vc4_crtc.c
View File

@ -835,7 +835,7 @@ static const struct vc4_pv_data bcm2835_pv2_data = {
.fifo_depth = 64, .fifo_depth = 64,
.pixels_per_clock = 1, .pixels_per_clock = 1,
.encoder_types = { .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, [PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,
}, },
}; };

2
drivers/gpu/drm/vc4/vc4_drv.h
View File

@ -426,7 +426,7 @@ to_vc4_plane_state(struct drm_plane_state *state)
enum vc4_encoder_type { enum vc4_encoder_type {
VC4_ENCODER_TYPE_NONE, VC4_ENCODER_TYPE_NONE,
VC4_ENCODER_TYPE_HDMI, VC4_ENCODER_TYPE_HDMI0,
VC4_ENCODER_TYPE_VEC, VC4_ENCODER_TYPE_VEC,
VC4_ENCODER_TYPE_DSI0, VC4_ENCODER_TYPE_DSI0,
VC4_ENCODER_TYPE_DSI1, VC4_ENCODER_TYPE_DSI1,

2
drivers/gpu/drm/vc4/vc4_hdmi.c
View File

@ -1309,7 +1309,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
GFP_KERNEL); GFP_KERNEL);
if (!vc4_hdmi_encoder) if (!vc4_hdmi_encoder)
return -ENOMEM; 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->encoder = &vc4_hdmi_encoder->base.base;
hdmi->pdev = pdev; hdmi->pdev = pdev;