Unverified Commit 66bf1c30 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: hdmi: Pass vc4_hdmi to CEC code 



Our CEC code also retrieves the associated vc4_hdmi by setting the
vc4_dev pointer as its private data, and then dereferences its vc4_hdmi
pointer.

In order to eventually get rid of that pointer, we can simply pass the
vc4_hdmi pointer directly.

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/cb575cb9e13018bce131b8535e5b572dc1027877.1599120059.git-series.maxime@cerno.tech
parent 5dfbcae6

drivers/gpu/drm/vc4/vc4_hdmi.c

+9 −15
Original line number Diff line number Diff line
@@ -1032,8 +1032,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) 
#ifdef CONFIG_DRM_VC4_HDMI_CEC

static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv)

{

	struct vc4_dev *vc4 = priv;

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	struct vc4_hdmi *vc4_hdmi = priv;



	if (vc4_hdmi->cec_irq_was_rx) {

		if (vc4_hdmi->cec_rx_msg.len)
@@ -1053,9 +1052,8 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) 
	return IRQ_HANDLED;

}



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

static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1)

{

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	struct cec_msg *msg = &vc4_hdmi->cec_rx_msg;

	unsigned int i;
@@ -1073,8 +1071,7 @@ static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1) 


static irqreturn_t vc4_cec_irq_handler(int irq, void *priv)

{

	struct vc4_dev *vc4 = priv;

	struct vc4_hdmi *vc4_hdmi = vc4->hdmi;

	struct vc4_hdmi *vc4_hdmi = priv;

	u32 stat = HDMI_READ(VC4_HDMI_CPU_STATUS);

	u32 cntrl1, cntrl5;
@@ -1085,7 +1082,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) 
	cntrl5 = HDMI_READ(VC4_HDMI_CEC_CNTRL_5);

	vc4_hdmi->cec_irq_was_rx = cntrl5 & VC4_HDMI_CEC_RX_CEC_INT;

	if (vc4_hdmi->cec_irq_was_rx) {

		vc4_cec_read_msg(vc4, cntrl1);

		vc4_cec_read_msg(vc4_hdmi, cntrl1);

		cntrl1 |= VC4_HDMI_CEC_CLEAR_RECEIVE_OFF;

		HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, cntrl1);

		cntrl1 &= ~VC4_HDMI_CEC_CLEAR_RECEIVE_OFF;
@@ -1101,8 +1098,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;

	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);

	/* clock period in microseconds */

	const u32 usecs = 1000000 / CEC_CLOCK_FREQ;

	u32 val = HDMI_READ(VC4_HDMI_CEC_CNTRL_5);
@@ -1145,8 +1141,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;

	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);



	HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1,

		   (HDMI_READ(VC4_HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) |
@@ -1157,8 +1152,7 @@ static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) 
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;

	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);

	u32 val;

	unsigned int i;
@@ -1305,7 +1299,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 


#ifdef CONFIG_DRM_VC4_HDMI_CEC

	vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,

						  vc4, "vc4",

						  vc4_hdmi, "vc4",

						  CEC_CAP_DEFAULTS |

						  CEC_CAP_CONNECTOR_INFO, 1);

	ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap);
@@ -1329,7 +1323,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
	ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0),

					vc4_cec_irq_handler,

					vc4_cec_irq_handler_thread, 0,

					"vc4 hdmi cec", vc4);

					"vc4 hdmi cec", vc4_hdmi);

	if (ret)

		goto err_delete_cec_adap;

	ret = cec_register_adapter(vc4_hdmi->cec_adap, dev);