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

drm/vc4: hdmi: Move accessors to vc4_hdmi 



The current driver only supports a single HDMI controller, and part of
the issue is that the main vc4_dev structure holds a pointer to its
(only) HDMI controller, and the HDMI registers accessors will use it to
retrieve the mapped addresses.

Let's modify those accessors to use directly the vc4_hdmi structure so
that we can eventually get rid of that single global pointer.

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/886b955586264ce078d7d35e9b8ef9ae51675c27.1599120059.git-series.maxime@cerno.tech
parent 3408cc23

drivers/gpu/drm/vc4/vc4_hdmi.c

+8 −14
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) 
{

	struct drm_device *dev = connector->dev;

	struct vc4_dev *vc4 = to_vc4_dev(dev);

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;



	if (vc4->hdmi->hpd_gpio) {

		if (gpio_get_value_cansleep(vc4->hdmi->hpd_gpio) ^
@@ -230,6 +231,7 @@ static int vc4_hdmi_stop_packet(struct drm_encoder *encoder, 
{

	struct drm_device *dev = encoder->dev;

	struct vc4_dev *vc4 = to_vc4_dev(dev);

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	u32 packet_id = type - 0x80;



	HDMI_WRITE(VC4_HDMI_RAM_PACKET_CONFIG,
@@ -244,6 +246,7 @@ static void vc4_hdmi_write_infoframe(struct drm_encoder *encoder, 
{

	struct drm_device *dev = encoder->dev;

	struct vc4_dev *vc4 = to_vc4_dev(dev);

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	u32 packet_id = frame->any.type - 0x80;

	u32 packet_reg = VC4_HDMI_RAM_PACKET(packet_id);

	uint8_t buffer[VC4_HDMI_PACKET_STRIDE];
@@ -623,9 +626,6 @@ static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = { 
/* HDMI audio codec callbacks */

static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi)

{

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_device *drm = encoder->dev;

	struct vc4_dev *vc4 = to_vc4_dev(drm);

	u32 hsm_clock = clk_get_rate(vc4_hdmi->hsm_clock);

	unsigned long n, m;
@@ -645,8 +645,6 @@ static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi) 
{

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_crtc *crtc = encoder->crtc;

	struct drm_device *drm = encoder->dev;

	struct vc4_dev *vc4 = to_vc4_dev(drm);

	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;

	u32 samplerate = vc4_hdmi->audio.samplerate;

	u32 n, cts;
@@ -683,7 +681,6 @@ static int vc4_hdmi_audio_startup(struct snd_pcm_substream *substream, 
	struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai);

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_connector *connector = &vc4_hdmi->connector.base;

	struct vc4_dev *vc4 = to_vc4_dev(encoder->dev);

	int ret;



	if (vc4_hdmi->audio.substream && vc4_hdmi->audio.substream != substream)
@@ -714,9 +711,7 @@ static int vc4_hdmi_audio_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
static void vc4_hdmi_audio_reset(struct vc4_hdmi *vc4_hdmi)

{

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_device *drm = encoder->dev;

	struct device *dev = &vc4_hdmi->pdev->dev;

	struct vc4_dev *vc4 = to_vc4_dev(drm);

	int ret;



	ret = vc4_hdmi_stop_packet(encoder, HDMI_INFOFRAME_TYPE_AUDIO);
@@ -747,10 +742,7 @@ static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream, 
				    struct snd_soc_dai *dai)

{

	struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai);

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_device *drm = encoder->dev;

	struct device *dev = &vc4_hdmi->pdev->dev;

	struct vc4_dev *vc4 = to_vc4_dev(drm);

	u32 audio_packet_config, channel_mask;

	u32 channel_map, i;
@@ -821,8 +813,6 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd, 
{

	struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai);

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_device *drm = encoder->dev;

	struct vc4_dev *vc4 = to_vc4_dev(drm);



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:
@@ -1082,7 +1072,8 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) 


static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1)

{

	struct cec_msg *msg = &vc4->hdmi->cec_rx_msg;

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	struct cec_msg *msg = &vc4_hdmi->cec_rx_msg;

	unsigned int i;



	msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >>
@@ -1128,6 +1119,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) 
static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)

{

	struct vc4_dev *vc4 = cec_get_drvdata(adap);

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	/* clock period in microseconds */

	const u32 usecs = 1000000 / CEC_CLOCK_FREQ;

	u32 val = HDMI_READ(VC4_HDMI_CEC_CNTRL_5);
@@ -1171,6 +1163,7 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) 
static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)

{

	struct vc4_dev *vc4 = cec_get_drvdata(adap);

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;



	HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1,

		   (HDMI_READ(VC4_HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) |
@@ -1182,6 +1175,7 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, 
				      u32 signal_free_time, struct cec_msg *msg)

{

	struct vc4_dev *vc4 = cec_get_drvdata(adap);

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	u32 val;

	unsigned int i;

drivers/gpu/drm/vc4/vc4_hdmi.h

+4 −4
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ struct vc4_hdmi { 
	struct debugfs_regset32 hd_regset;

};



#define HDMI_READ(offset) readl(vc4->hdmi->hdmicore_regs + offset)

#define HDMI_WRITE(offset, val) writel(val, vc4->hdmi->hdmicore_regs + offset)

#define HD_READ(offset) readl(vc4->hdmi->hd_regs + offset)

#define HD_WRITE(offset, val) writel(val, vc4->hdmi->hd_regs + offset)

#define HDMI_READ(offset) readl(vc4_hdmi->hdmicore_regs + offset)

#define HDMI_WRITE(offset, val) writel(val, vc4_hdmi->hdmicore_regs + offset)

#define HD_READ(offset) readl(vc4_hdmi->hd_regs + offset)

#define HD_WRITE(offset, val) writel(val, vc4_hdmi->hd_regs + offset)



#endif /* _VC4_HDMI_H_ */