From mboxrd@z Thu Jan 1 00:00:00 1970 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 595E4C021A9 for ; Sat, 14 Sep 2024 18:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HX95DagvYfhwti1x7dWCuVTMArYsK6qZmkKzNXOu0Us=; b=Hh5xfhQQCSzmeJ+sc+4mWHPxii SEucXWhj6jC8TcU1fBjb+scrNV2gnQKIbkEm3uADnohpjyqW3GAOvYbqVoBnV/KxYdeRpLwChalqO 4JxZKG7nwr1i9ybrWTVZ7fH3+OTnyTVkwJruUYAZp02TSTi9iRybqzZWTafNgTsokZoOyPONth9l8 jcaLbtn3S+J0YzpyQxkZCkrqVHQoP9J3o9qw0FqF5YsX/bcHvJsFM5U4eb2lUWc4MSrmmusVDQ329 WhJqEmhV63NTBb6KlHtg+Ic5siETNT8o9FVa9iRgjsDWQJkHi/LLTFRn+KqkN8vkCSZjU37bNzphM O9g7P5IA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1spXXA-000000016Ty-1IP7; Sat, 14 Sep 2024 18:30:12 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1spXW3-000000016O6-3Z03; Sat, 14 Sep 2024 18:29:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1726338541; bh=2yDJGLRu2gAeWgfvO6TGgF4YVt64dhBuu/OY77p7t8A=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=eh1sKraz7x9kS3czQy+9/fxF6N5XeQ2mG7h7DIfI7MMRO6tTWxgv44vLDlA+n1bh+ jSnYtFGAzkeFL3gvy2XX5PhQ48FW7Od8+q1a/w6/w24Bi88Z4k8YKJ4YenNRROaVFd LdrDqbRzdDz8z3hP1pqzcVPqWVDyzMtEdc4F8zzruM2k5sXsjqxw/lJA1vmspSz9aB zmVW9wsE1p4W+ZGO+rHnHKC7oKXrfPpGuLZW9O4YFa8EtEiYpwNeV3lVcqwPaCyOVe wDl3AuaAwFipLxjpYHtml4e5MpY5mMw6mBIUDjovM5Vye9DGWYZcn4APWVFdF/dhKH 9q4wvwp3UZMtw== Received: from [192.168.1.90] (unknown [188.27.55.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 5F8BF17E3608; Sat, 14 Sep 2024 20:29:00 +0200 (CEST) Message-ID: <4766d230-c9c3-414d-a954-3b0c890e7e08@collabora.com> Date: Sat, 14 Sep 2024 21:28:59 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 3/3] drm/rockchip: Add basic RK3588 HDMI output support To: =?UTF-8?Q?Heiko_St=C3=BCbner?= , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sandy Huang , Andy Yan , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mark Yao , Sascha Hauer Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, kernel@collabora.com, Alexandre ARNOUD , Luis de Arquer , Algea Cao References: <20240906-b4-rk3588-bridge-upstream-v6-0-a3128fb103eb@collabora.com> <20240906-b4-rk3588-bridge-upstream-v6-3-a3128fb103eb@collabora.com> <2376712.1SvkZsmPdQ@diego> Content-Language: en-US From: Cristian Ciocaltea In-Reply-To: <2376712.1SvkZsmPdQ@diego> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240914_112904_083351_6B761C5F X-CRM114-Status: GOOD ( 22.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 9/10/24 10:08 PM, Heiko Stübner wrote: > Am Freitag, 6. September 2024, 03:17:42 CEST schrieb Cristian Ciocaltea: >> The RK3588 SoC family integrates the newer Synopsys DesignWare HDMI 2.1 >> Quad-Pixel (QP) TX controller IP and a HDMI/eDP TX Combo PHY based on a >> Samsung IP block. >> >> Add just the basic support for now, i.e. RGB output up to 4K@60Hz, >> without audio, CEC or any of the HDMI 2.1 specific features. >> >> Co-developed-by: Algea Cao >> Signed-off-by: Algea Cao >> Tested-by: Heiko Stuebner >> Signed-off-by: Cristian Ciocaltea > > [...] > >> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile >> index 3ff7b21c0414..3eab662a5a1d 100644 >> --- a/drivers/gpu/drm/rockchip/Makefile >> +++ b/drivers/gpu/drm/rockchip/Makefile >> @@ -11,6 +11,7 @@ rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o > >> +static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, >> + void *data) >> +{ >> + static const char * const clk_names[] = { >> + "pclk", "earc", "aud", "hdp", "hclk_vo1", >> + "ref" /* keep "ref" last */ >> + }; > > [...] > >> + for (i = 0; i < ARRAY_SIZE(clk_names); i++) { >> + clk = devm_clk_get_enabled(hdmi->dev, clk_names[i]); >> + >> + if (IS_ERR(clk)) { >> + ret = PTR_ERR(clk); >> + if (ret != -EPROBE_DEFER) >> + drm_err(hdmi, "Failed to get %s clock: %d\n", >> + clk_names[i], ret); >> + return ret; >> + } >> + } >> + hdmi->ref_clk = clk; > > How about using devm_clk_bulk_get_all_enable() for everything except the > refclk and a separate call to devm_clk_get_enabled() for that refclk . This helper seems to be partially broken as it doesn't return the number of clocks stored in the clk_bulk_data table referenced by the clks argument, meaning it's not possible to iterate these clocks. I provided a new helper [1] as a possible fix. If that gets accepted, we could rewrite this as: ret = devm_clk_bulk_get_all_enabled(hdmi->dev, &clks); if (ret < 0) { drm_err(hdmi, "Failed to get clocks: %d\n", ret); return ret; } for (i = 0; i < ret; i++) { if (!strcmp(clks[i].id, "ref")) { hdmi->ref_clk = clks[1].clk; break; } } if (!hdmi->ref_clk) { drm_err(hdmi, "Missing ref clock\n"); return -EINVAL; } > That hdmi->ref_clk just accidentially falls out of that loop at the end > looks somewhat strange, so getting and keeping that refclk > separately would make this look cleaner. I've added /* keep "ref" last */ comment above, but I agree it's not really the best approach. I'm going to submit v7 in the meantime, as this was the last remaining open topic on my list. I guess we can figure this out afterwards. Thanks, Cristian [1] https://lore.kernel.org/lkml/20240914-clk_bulk_ena_fix-v1-0-ce3537585c06@collabora.com/