From patchwork Mon Feb 17 21:47:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Detlev Casanova X-Patchwork-Id: 13978688 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CFB5EC021AA for ; Mon, 17 Feb 2025 21:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=b7PzY4jXikwNqVBoo1shsUMr3TvZacTqG1wMpBmwX6c=; b=CC5k/+QbEerXfq /G0t0PJfVr2KH/iOWYwBT4HiTdAYnyvhRxqv8lOvdigXpKbyd8KdkFvEY4XoRNvQl6XmCXCYOffrz Uvdp8W13pAuL5oWgu4FLhsNP6BImyIcIFrQwB5QWmVWtDO2xtN14pNP0u219zbO3KC/jGeOcr3MTi +n+Hm9DbLuH968mLojoTe+9Xc4QTrmQCqYaWx7KwVoPCNIL5S27vzdfrLlvqtucqc+doF+OIULApZ 9UUQ/Z3e/1Sxi+69EgRCDIb/O/OhUCAWL4yGQ4rgN3zTGxYgE/qw2yPzijNt8gf/XbEi9GGVtSMPz gJ6DQLsZmEjLQO1xYYhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tk98E-0000000652B-0Niy; Mon, 17 Feb 2025 21:58:26 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tk96j-000000064ky-1mGR; Mon, 17 Feb 2025 21:56:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1739829411; bh=4VaQl0NtT63hn4RIkgnKAbuhy0jcZQTdg7q6kxOv9w4=; h=From:To:Cc:Subject:Date:From; b=ItSMsNHLFu60POXzGfILeItDV8X97590ll35srQbAmVX16kSPDUODZdf6YAxnsN1M KejkAQ6qv6fiX45IYVEGfQ+9XZP9r2U9WJimqPIeBCFZatdHkmwThy+bAgBvfOabPs UhoA6D8C6zcWU/x7BJa9B5QulVfrJ2ZIEhPjn/RJKyve4M7+8SFLm66heJQ/+tL/dg hgZIu110oCwxgZVRc3zHP822L/mW8SEmgVlh/bQMt7LuHIKs/ZPKY+3ow+o4lmLlEf LWfdqrhgvrupjCMvruyKtLbk1dffm3Gbz1SwI52UlDhj8awzUQqHwAEjRiiWH9yc+c doe5tyoH0nteg== Received: from earth.mtl.collabora.ca (mtl.collabora.ca [66.171.169.34]) (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: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 1CEAE17E02BE; Mon, 17 Feb 2025 22:56:44 +0100 (CET) From: Detlev Casanova To: linux-kernel@vger.kernel.org Subject: [PATCH v7 0/3] Add HDMI audio on the rk3588 SoC Date: Mon, 17 Feb 2025 16:47:39 -0500 Message-ID: <20250217215641.372723-1-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250217_135653_621678_1EEF8B6C X-CRM114-Status: GOOD ( 17.31 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Algea Cao , Heiko Stuebner , Geert Uytterhoeven , dri-devel@lists.freedesktop.org, Niklas Cassel , Laurent Pinchart , Andrzej Hajda , kernel@collabora.com, David Airlie , Dragan Simic , Simona Vetter , Rob Herring , Detlev Casanova , Robert Foss , Sebastian Reichel , Jernej Skrabec , Sugar Zhang , linux-rockchip@lists.infradead.org, Chen-Yu Tsai , FUKAUMI Naoki , devicetree@vger.kernel.org, Conor Dooley , Jonas Karlman , Maarten Lankhorst , Maxime Ripard , Dmitry Baryshkov , Johan Jonker , linux-arm-kernel@lists.infradead.org, Neil Armstrong , Alexey Charkov , Thomas Zimmermann , Krzysztof Kozlowski Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org To support HDMI audio on the rk3588 based devices, the generic HDMI Codec framework is used in the dw-hdmi-qp DRM bridge driver. The implementation is mainly based on the downstream driver, ported to the generic HDMI Codec framework [1] recently merged in the master branch. The parameters computation has been kept as is and the data stored in the dw_hdmi_qp struct as been cleaned up. The table for the N values has been edited to reflect N recommended values as well as CTS recommended values. The downstream kernel also implements a machine driver for HDMI audio but it is doing exactly what the simple-audio-card driver does, so use that instead in the RK3588 SoC device tree. This adds HDMI audio support for both HDMI TX ports. *** Dependencies *** Based on Linus' master branch, but also needs Cristian's dts patches for HDMI1 support [2], which depends on Heiko's patchset for phy-rockchip-samsung-hdptx [3]. Patches will apply without [3], but HDMI will not work (at all). [1]: https://lore.kernel.org/all/20241224-drm-bridge-hdmi-connector-v10-0-dc89577cd438@linaro.org [2]: https://lore.kernel.org/linux-rockchip/20241211-rk3588-hdmi1-v2-0-02cdca22ff68@collabora.com [3]: https://lore.kernel.org/lkml/20241206103401.1780416-3-heiko@sntech.de/ Changes since v6: - Fix arguments alignement (checkpatch --strict warnings) - Add hdmi1 audio support too - Move hdmi0_sound node under hdmi0_out_con Changes since v5: - Simplify audio math computation for N - Move hdmi0-sound node up with other address-less nodes Changes since v4: - Moved hdmi0_audio node the rk3588-base.dtsi - Enable hdmi0_audio in rk3588-rock-5b.dts Changes since v3: - Renamed function to start with dw_hdmi_qp Changes since v2: - Also clear the audio infoframe - Write AUDI_CONTENTS0 to its default value in case it gets overwritten. - Store tmds_char_rate in the dw_hdmi_qp struct in atomic_enable - Clear tmds_char_rate in atomic_disable and only write registers when tmds_char_rate is not 0. - Do not use connector_state duplicates Changes since v1: - Remove useless audio_mutex (was used downstream for multiple drivers access to audio functions) - Let hdmi_codec build and setup audio infoframes - Only access audio registers when connector is connected - Rebased on master branch Detlev Casanova (2): arm64: dts: rockchip: Add HDMI audio outputs for rk3588 SoC arm64: dts: rockchip: Enable HDMI audio outputs for Rock 5B Sugar Zhang (1): drm/bridge: synopsys: Add audio support for dw-hdmi-qp arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 17 + .../arm64/boot/dts/rockchip/rk3588-extra.dtsi | 17 + .../boot/dts/rockchip/rk3588-rock-5b.dts | 16 + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 489 ++++++++++++++++++ 4 files changed, 539 insertions(+)