Unverified Commit ed024b22 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarMaxime Ripard <maxime@cerno.tech>
Tested-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Tested-by: default avatarHoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/84e11e4793aaa30d6e5c56e305d22404ac5a932d.1599120059.git-series.maxime@cerno.tech
parent 62c5d55e

drivers/gpu/drm/vc4/vc4_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static const struct vc4_pv_data bcm2835_pv2_data = { 
	.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,

	},

};

drivers/gpu/drm/vc4/vc4_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ to_vc4_plane_state(struct drm_plane_state *state) 


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,

drivers/gpu/drm/vc4/vc4_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1309,7 +1309,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
					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;