From nobody Thu Dec 18 20:41:35 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 102252500DE; Mon, 13 Jan 2025 14:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736779994; cv=none; b=ZD39ePZUYUZxSJYtT5H633KWnA6zRmQBKUvBuruIkMBrqcBBQIGrQO7m+oFnqvif0inZ/otohcL800gOFIHWP9YcwNFsAV8DVrIu32GpXR5XHapcrBVb0RWPIFFObQ5gHjle4SYOVbhZHP+C5FI43K2O8/afslbRs/hEA8lPg6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736779994; c=relaxed/simple; bh=40lkq1wxaHnaUhHgGA9f/nHbe/9wC07E5JGtUfl/GZ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mWiKFKjB+whToCIEBpDXuvZL+WN3NI5/F7dw8NJ/ICwmeFsOC8aRJ3EeTE6CCWhg5LmcaNfuC1HwPw0nnt0zX/eKeIeoYDHqpQ31r3vWPv32zVlBPFVcc/CSn5/BFidLNlYpE6NM4f5Mji1uPaz5aPPAQ6rKWRZCt+ARuhsuqe4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=lOMfDGJH; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="lOMfDGJH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1736779991; bh=40lkq1wxaHnaUhHgGA9f/nHbe/9wC07E5JGtUfl/GZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lOMfDGJHhwq20TLIO6GL6Xmj+OZQ8pP4p5WkLYHpvd807HGR6c3I3jIOT6kPL30xJ F25zhqRwbc20MNAULeXqPdSM+t3mQx3sh9tzA8QlwUmQP1hCXzN5tqXNa5oOxY98Pv b5KZDWgl8GRDop/rjTC0zZRWOqkE/2OrGms4ZkvxzkNgd3K7VDdYVw8jhH8De6dq/t nBr25qWAvrRPKWCaJVE+iS+o9XoRYPTkpT6ieO89N2etn0qO7BlsVAW89hckK9RxXC TfaUZ7fFdDYkhtpA+iAhR67hKAhSNHPsO96ncqeiCNUqAvv3XCkdL19wurOqhC6KXl j7ACke9wqVAew== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id 4A1BF17E0FAA; Mon, 13 Jan 2025 15:53:10 +0100 (CET) From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, ck.hu@mediatek.com, jitao.shi@mediatek.com, jie.qiu@mediatek.com, junzhi.zhao@mediatek.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, dmitry.baryshkov@linaro.org, lewis.liao@mediatek.com, ives.chenjh@mediatek.com, tommyyl.chen@mediatek.com, jason-jh.lin@mediatek.com Subject: [PATCH v5 23/34] drm/mediatek: mtk_hdmi: Move output init to mtk_hdmi_register_audio_driver() Date: Mon, 13 Jan 2025 15:52:21 +0100 Message-ID: <20250113145232.227674-24-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250113145232.227674-1-angelogioacchino.delregno@collabora.com> References: <20250113145232.227674-1-angelogioacchino.delregno@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 to aggregate all of the initial audio setup together in the same function and to make it clear that all of the setup that is performed in mtk_hdmi_output_init is specifically related only to audio and not video. While at it, also remove the "%s driver bound to HDMI" debugging print disguised as informative. Signed-off-by: AngeloGioacchino Del Regno --- 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 e2393f7558f9..4345c91e92e7 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; } =20 -static int mtk_hdmi_output_init(struct mtk_hdmi *hdmi) -{ - struct hdmi_audio_param *aud_param =3D &hdmi->aud_param; - - aud_param->aud_codec =3D HDMI_AUDIO_CODING_TYPE_PCM; - aud_param->aud_sample_size =3D HDMI_AUDIO_SAMPLE_SIZE_16; - aud_param->aud_input_type =3D HDMI_AUD_INPUT_I2S; - aud_param->aud_i2s_fmt =3D HDMI_I2S_MODE_I2S_24BIT; - aud_param->aud_mclk =3D HDMI_AUD_MCLK_128FS; - aud_param->aud_input_chan_type =3D 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); @@ -1616,6 +1602,7 @@ static void mtk_hdmi_unregister_audio_driver(void *da= ta) static int mtk_hdmi_register_audio_driver(struct device *dev) { struct mtk_hdmi *hdmi =3D dev_get_drvdata(dev); + struct hdmi_audio_param *aud_param =3D &hdmi->aud_param; struct hdmi_codec_pdata codec_data =3D { .ops =3D &mtk_hdmi_audio_codec_ops, .max_i2s_channels =3D 2, @@ -1625,6 +1612,13 @@ static int mtk_hdmi_register_audio_driver(struct dev= ice *dev) }; int ret; =20 + aud_param->aud_codec =3D HDMI_AUDIO_CODING_TYPE_PCM; + aud_param->aud_sample_size =3D HDMI_AUDIO_SAMPLE_SIZE_16; + aud_param->aud_input_type =3D HDMI_AUD_INPUT_I2S; + aud_param->aud_i2s_fmt =3D HDMI_I2S_MODE_I2S_24BIT; + aud_param->aud_mclk =3D HDMI_AUD_MCLK_128FS; + aud_param->aud_input_chan_type =3D HDMI_AUD_CHAN_TYPE_2_0; + hdmi->audio_pdev =3D platform_device_register_data(dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO, @@ -1638,7 +1632,6 @@ static int mtk_hdmi_register_audio_driver(struct devi= ce *dev) if (ret) return ret; =20 - DRM_INFO("%s driver bound to HDMI\n", HDMI_CODEC_DRV_NAME); return 0; } =20 @@ -1667,11 +1660,6 @@ static int mtk_hdmi_probe(struct platform_device *pd= ev) mutex_init(&hdmi->update_plugged_status_lock); platform_set_drvdata(pdev, hdmi); =20 - ret =3D mtk_hdmi_output_init(hdmi); - if (ret) - return dev_err_probe(dev, ret, - "Failed to initialize hdmi output\n"); - ret =3D mtk_hdmi_register_audio_driver(dev); if (ret) return dev_err_probe(dev, ret, --=20 2.47.0