<html><body><p> <pre> Hi, Angelo: On Tue, 2024-12-17 at 16:43 +0100, AngeloGioacchino Del Regno wrote: > External email : Please do not click links or open attachments until you have verified the sender or the content. > > > In preparation for moving the common bits of this driver, merge the > contents of mtk_hdmi_output_init in mtk_hdmi_register_audio_driver > function. > > While at it, also remove the "%s driver bound to HDMI" debugging > print disguised as informative. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/gpu/drm/mediatek/mtk_hdmi.c | 28 ++++++++-------------------- > 1 file changed, 8 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index 3ecd0ed59851..2d5cf7352ed2 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -1025,20 +1025,6 @@ static int mtk_hdmi_setup_vendor_specific_infoframe(struct mtk_hdmi *hdmi, > return 0; > } > > -static int mtk_hdmi_output_init(struct mtk_hdmi *hdmi) > -{ > - struct hdmi_audio_param *aud_param = &hdmi->aud_param; > - > - aud_param->aud_codec = HDMI_AUDIO_CODING_TYPE_PCM; > - aud_param->aud_sample_size = HDMI_AUDIO_SAMPLE_SIZE_16; > - aud_param->aud_input_type = HDMI_AUD_INPUT_I2S; > - aud_param->aud_i2s_fmt = HDMI_I2S_MODE_I2S_24BIT; > - aud_param->aud_mclk = HDMI_AUD_MCLK_128FS; > - aud_param->aud_input_chan_type = HDMI_AUD_CHAN_TYPE_2_0; > - > - return 0; > -} > - > static void mtk_hdmi_audio_enable(struct mtk_hdmi *hdmi) > { > mtk_hdmi_hw_send_aud_packet(hdmi, true); > @@ -1617,6 +1603,7 @@ static void mtk_hdmi_unregister_audio_driver(void *data) > static int mtk_hdmi_register_audio_driver(struct device *dev) > { > struct mtk_hdmi *hdmi = dev_get_drvdata(dev); > + struct hdmi_audio_param *aud_param = &hdmi->aud_param; > struct hdmi_codec_pdata codec_data = { > .ops = &mtk_hdmi_audio_codec_ops, > .max_i2s_channels = 2, > @@ -1625,6 +1612,13 @@ static int mtk_hdmi_register_audio_driver(struct device *dev) > }; > int ret; > > + aud_param->aud_codec = HDMI_AUDIO_CODING_TYPE_PCM; > + aud_param->aud_sample_size = HDMI_AUDIO_SAMPLE_SIZE_16; > + aud_param->aud_input_type = HDMI_AUD_INPUT_I2S; > + aud_param->aud_i2s_fmt = HDMI_I2S_MODE_I2S_24BIT; > + aud_param->aud_mclk = HDMI_AUD_MCLK_128FS; > + aud_param->aud_input_chan_type = HDMI_AUD_CHAN_TYPE_2_0; > + > hdmi->audio_pdev = platform_device_register_data(dev, > HDMI_CODEC_DRV_NAME, > PLATFORM_DEVID_AUTO, > @@ -1640,7 +1634,6 @@ static int mtk_hdmi_register_audio_driver(struct device *dev) > return ret; > } > > - DRM_INFO("%s driver bound to HDMI\n", HDMI_CODEC_DRV_NAME); > return 0; > } > > @@ -1669,11 +1662,6 @@ static int mtk_hdmi_probe(struct platform_device *pdev) > mutex_init(&hdmi->update_plugged_status_lock); > platform_set_drvdata(pdev, hdmi); > > - ret = mtk_hdmi_output_init(hdmi); > - if (ret) > - return dev_err_probe(dev, ret, > - "Failed to initialize hdmi output\n"); > - I think without this merge, mtk_hdmi_output_init() could still be common code. So the reason is weird. This merge look not necessary. Regards, CK > ret = mtk_hdmi_register_audio_driver(dev); > if (ret) > return dev_err_probe(dev, ret, > -- > 2.47.0 > </pre> </p></body></html><pre>************* MEDIATEK Confidentiality Notice ******************** The information contained in this e-mail message (including any attachments) may be confidential, proprietary, privileged, or otherwise exempt from disclosure under applicable laws. It is intended to be conveyed only to the designated recipient(s). Any use, dissemination, distribution, printing, retaining or copying of this e-mail (including its attachments) by unintended recipient(s) is strictly prohibited and may be unlawful. If you are not an intended recipient of this e-mail, or believe that you have received this e-mail in error, please notify the sender immediately (by replying to this e-mail), delete any and all copies of this e-mail (including any attachments) from your system, and do not disclose the content of this e-mail to any other person. Thank you! </pre>