Messages in this thread Patch in this message | | | Date | Mon, 7 Nov 2022 12:09:33 +0100 | Subject | Re: [PATCH v3 08/12] drm/mediatek: hdmi: v2: add audio support | From | AngeloGioacchino Del Regno <> |
| |
Il 04/11/22 15:09, Guillaume Ranquet ha scritto: > Add HDMI audio support for v2 > > Signed-off-by: Guillaume Ranquet <granquet@baylibre.com> > --- > drivers/gpu/drm/mediatek/mtk_hdmi_common.c | 1 + > drivers/gpu/drm/mediatek/mtk_hdmi_ddc_v2.c | 2 +- > drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 213 +++++++++++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_hdmi_v2.h | 2 + > 4 files changed, 217 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_common.c b/drivers/gpu/drm/mediatek/mtk_hdmi_common.c > index e43c938a9aa5..1ea91f8bb6c7 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_common.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_common.c > @@ -386,6 +386,7 @@ static const struct mtk_hdmi_conf mtk_hdmi_conf_v2 = { > .mtk_hdmi_output_init = mtk_hdmi_output_init_v2, > .mtk_hdmi_clk_disable = mtk_hdmi_clk_disable_v2, > .mtk_hdmi_clk_enable = mtk_hdmi_clk_enable_v2, > + .set_hdmi_codec_pdata = set_hdmi_codec_pdata_v2,
Keep naming consistent please:
.mtk_hdmi_set_codec_pdata = mtk_hdmi_set_codec_pdata_v2,
> .mtk_hdmi_clock_names = mtk_hdmi_clk_names_v2, > .num_clocks = MTK_HDMIV2_CLK_COUNT, > }; > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc_v2.c b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc_v2.c > index 61696d255e51..26456802a5c4 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_ddc_v2.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_ddc_v2.c > @@ -309,7 +309,7 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev) > ddc->regs = device_node_to_regmap(hdmi); > of_node_put(hdmi); > if (IS_ERR(ddc->regs)) > - return dev_err_probe(dev, PTR_ERR(ddc->regs), "Unable to get mt8195-hdmi syscon"); > + return dev_err_probe(dev, PTR_ERR(ddc->regs), "Unable to get hdmi syscon");
You might as well do the rename in the commit that actually introduces this file, since you're doing that in the same series.
Please do so.
> > ddc->clk = devm_clk_get_enabled(dev, "ddc"); > if (IS_ERR(ddc->clk)) > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c b/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c > index e8457429964d..b391b22fa9f5 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_v2.c > @@ -211,6 +211,26 @@ static void mtk_hdmi_hw_vid_black(struct mtk_hdmi *hdmi, bool black) > mtk_hdmi_mask(hdmi, TOP_VMUTE_CFG1, 0, REG_VMUTE_EN); > } > > +static void mtk_hdmi_hw_aud_mute(struct mtk_hdmi *hdmi) > +{ > + u32 val; > + > + val = mtk_hdmi_read(hdmi, AIP_CTRL, &val); > + > + if (val & DSD_EN) > + mtk_hdmi_mask(hdmi, AIP_TXCTRL, > + DSD_MUTE_DATA | AUD_MUTE_FIFO_EN,
I think I already gave you some advice to shorten this in an earlier series version.
Besides, you can also use the FIELD_PREP() macro here, and please use it.
P.S.: val = FIELD_PREP(... something AUD_MUTE_FIFO_EN); if (val & DSD_EN) val |= FIELD_PREP( ... something DSD_MUTE_DATA)
mtk_hdmi_mask(hdmi, AIP_TXCTRL, val, val);
> + DSD_MUTE_DATA | AUD_MUTE_FIFO_EN); > + else > + mtk_hdmi_mask(hdmi, AIP_TXCTRL, AUD_MUTE_FIFO_EN, > + AUD_MUTE_FIFO_EN); > +} > + > +static void mtk_hdmi_hw_aud_unmute(struct mtk_hdmi *hdmi) > +{ > + mtk_hdmi_mask(hdmi, AIP_TXCTRL, AUD_MUTE_DIS, AUD_MUTE_FIFO_EN); > +} > + > static void mtk_hdmi_hw_reset(struct mtk_hdmi *hdmi) > { > mtk_hdmi_mask(hdmi, HDMITX_CONFIG, 0x0, HDMITX_SW_RSTB); > @@ -889,6 +909,7 @@ static void mtk_hdmi_audio_reset(struct mtk_hdmi *hdmi, bool rst)
..snip..
> @@ -935,6 +957,28 @@ static void mtk_hdmi_reset_colorspace_setting(struct mtk_hdmi *hdmi) > hdmi->ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_LIMITED; > } > > +static void mtk_hdmi_audio_enable(struct mtk_hdmi *hdmi)
These two functions are used only in one function (each)... so you don't need them. Just move the two lines in mtk_hdmi_audio_startup() ...
> +{ > + mtk_hdmi_aud_enable_packet(hdmi, true); > + hdmi->audio_enable = true; > +} > + > +static void mtk_hdmi_audio_disable(struct mtk_hdmi *hdmi) > +{
... and in mtk_hdmi_audio_shutdown().
> + mtk_hdmi_aud_enable_packet(hdmi, false); > + hdmi->audio_enable = false; > +} > + > +static void mtk_hdmi_audio_set_param(struct mtk_hdmi *hdmi, > + struct hdmi_audio_param *param) > +{ > + if (!hdmi->audio_enable) > + return; > + > + memcpy(&hdmi->aud_param, param, sizeof(*param)); > + mtk_hdmi_aud_output_config(hdmi, &hdmi->mode); > +} > + > static void mtk_hdmi_change_video_resolution(struct mtk_hdmi *hdmi) > { > bool is_over_340M = false;
..snip..
> + > +static int mtk_hdmi_audio_mute(struct device *dev, void *data, bool enable, > + int direction) > +{ > + struct mtk_hdmi *hdmi = dev_get_drvdata(dev); > + > + if (direction != SNDRV_PCM_STREAM_PLAYBACK)
Why aren't you returning an error here?
If this is really supposed to be like that, please add a comment in the code explaining the reason, so that the next person reading this won't mistakenly change that.
> + return 0; > + > + if (enable) > + mtk_hdmi_hw_aud_mute(hdmi); > + else > + mtk_hdmi_hw_aud_unmute(hdmi); > + > + return 0; > +} > +
Regards, Angelo
| |