diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch b/target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch new file mode 100644 index 0000000000..b0abafc699 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch @@ -0,0 +1,107 @@ +From 8af2552e862100e843b8d1f36543b718dde393ad Mon Sep 17 00:00:00 2001 +From: Maxime Ripard <maxime@cerno.tech> +Date: Mon, 6 Jan 2020 18:47:53 +0100 +Subject: [PATCH] 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: Maxime Ripard <maxime@cerno.tech> +--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 24 +++++++++--------------- + 1 file changed, 9 insertions(+), 15 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -1043,8 +1043,7 @@ static int vc4_hdmi_audio_init(struct vc + #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) +@@ -1064,9 +1063,8 @@ static irqreturn_t vc4_cec_irq_handler_t + 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; + +@@ -1084,8 +1082,7 @@ static void vc4_cec_read_msg(struct vc4_ + + 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; + +@@ -1096,7 +1093,7 @@ static irqreturn_t vc4_cec_irq_handler(i + 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; +@@ -1112,8 +1109,7 @@ static irqreturn_t vc4_cec_irq_handler(i + + 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); +@@ -1156,8 +1152,7 @@ static int vc4_hdmi_cec_adap_enable(stru + + 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) | +@@ -1168,8 +1163,7 @@ static int vc4_hdmi_cec_adap_log_addr(st + 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; + +@@ -1315,7 +1309,7 @@ static int vc4_hdmi_bind(struct device * + + #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); +@@ -1339,7 +1333,7 @@ static int vc4_hdmi_bind(struct device * + 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); |