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 B966EC3DA6E for ; Fri, 5 Jan 2024 17:50:51 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cMdcphi5gkqWDvUsJwD8JjhnyHXNaT153os2cb4OI/Q=; b=zSHk5O0rYppjJG fl9MMaMjE6r63zgz5Lh7+yDrK9lJGdKf7pVpni0EbchLaTLPPtJlLoCDaXkFrrEgLk/d5OjA6M8Rq Je4Q6SFDsyvVmQXUZ76XTDvEeSydduUSAnslUEDiIfkKZC8OZGYuEmHHSIle9ciliMTt53sklJBlT hA+odyA9q5MLroT0W/L6zLHMQTHzS9xfKwLV8utcgoVV3p7GHy4sYkirGoI2B8oUQiIu3mqgriWqg WXiSwDvyKTEicvxKewgt/Gyo+wC8UMLQ4PiwW9M1fXcJCyT6Huza0/xJcf36lD/kXCJgrf5EzsV2o sxBd5k31pInTGRgxQeYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rLoLF-00HSyX-04; Fri, 05 Jan 2024 17:50:45 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rLoLC-00HSx8-1G; Fri, 05 Jan 2024 17:50:44 +0000 Received: from i53875a56.versanet.de ([83.135.90.86] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rLoL6-0006fs-Ab; Fri, 05 Jan 2024 18:50:36 +0100 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Alex Bee Cc: Krzysztof Kozlowski , Conor Dooley , Thomas Zimmermann , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, David Airlie , Rob Herring , Sandy Huang , Maarten Lankhorst , Maxime Ripard Subject: Re: (subset) [PATCH v4 00/29] Add HDMI support for RK3128 Date: Fri, 05 Jan 2024 18:50:35 +0100 Message-ID: <7002847.tM3a2QDmDi@diego> In-Reply-To: <31af9449-67df-4a1d-942c-60405f653409@gmail.com> References: <20231222174220.55249-1-knaerzche@gmail.com> <2568547.3Lj2Plt8kZ@diego> <31af9449-67df-4a1d-942c-60405f653409@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240105_095042_436259_44FD1314 X-CRM114-Status: GOOD ( 28.51 ) 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: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Am Freitag, 5. Januar 2024, 18:33:34 CET schrieb Alex Bee: > = > Am 05.01.24 um 18:02 schrieb Heiko St=FCbner: > > Am Freitag, 5. Januar 2024, 17:47:21 CET schrieb Alex Bee: > >> Hi Heiko, > >> > >> > >> Am 04.01.24 um 09:14 schrieb Heiko Stuebner: > >>> On Fri, 22 Dec 2023 18:41:51 +0100, Alex Bee wrote: > >>>> This is version 4 of my series that aims to add support for the disp= lay > >>>> controller (VOP) and the HDMI controller block of RK3128 (which is v= ery > >>>> similar to the one found in RK3036). The original intention of this = series > >>>> was to add support for this slightly different integration but is by= now, > >>>> driven by maintainer's feedback, exploded to be a rework of inno-hdmi > >>>> driver in large parts. It is, however, a change for the better. > >>>> > >>>> [...] > >>> Applied, thanks! > >>> > >>> [23/29] drm/rockchip: inno_hdmi: Add variant support > >>> commit: 5f2e93e6719701a91307090f8f7696fd6b3bffdf > >>> [24/29] drm/rockchip: inno_hdmi: Add RK3128 support > >>> commit: aa54f334c291effe321aa4b9ac0e67a895fd7b58 > >>> [25/29] drm/rockchip: inno_hdmi: Add basic mode validation > >>> commit: 701029621d4141d0c9f8b81a88a37b95ec84ce65 > >>> [26/29] drm/rockchip: inno_hdmi: Drop custom fill_modes hook > >>> commit: 50a3c772bd927dd409c484832ddd9f6bf00b7389 > >>> > >>> > >>> For reference, Rob has applied the rk3128 compatible in > >>> https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit= /?id=3D21960bda59852ca961fcd27fba9f92750caccd06 > >> thanks for keeping track on this. > >> > >> Is there any reason the DT paches aren't merged yet? From what I can s= ee > >> they should be fine to be merged in your v6.8-armsoc/dts32 branch whic= h is > >> 6.7-rc1 based. There was only a txt-binding at this point and it's very > >> likely that both the rockchip,inno-hdmi.yaml-conversion and the rk3128 > >> additon will both land in 6.8 (they are both in linux-next). Linus' 6.8 > >> merge-window will open earliest next week. > > Exactly ... and the arm subarchitectures (Rockchip, etc) feed into the > > more generic soc-tree[0] and from there in a set of pull requests. > > > > Normally everything needs to go to the soc tree before -rc7 . > > With the whole xmas stuff, I sent some stragglers in a second pull > > request on monday, but that was already before Rob applied the > > binding on tuesday. > > > > So 6.8 devicetree stuff is essentially done and the dts patches > > from this series will go in to 6.9 . > > > > > > Hope that explains things a bit :-) > I assumed (for some reason) that sub-architecture maintainers are allowed > to send PRs to the respective upper tree until the merge window opens and > "all the rest" is done within this ~2 weeks. > Thanks for explaining. No worries :-) . The general rule of thumb is that everything should be done and ready before the merge-window opens. Linus often writes very positively about people sending him pull-requests even before the merge window opens ;-) [meaning their tree is settled early and all test-robots have run] And there are different rules in every tree. For the soc tree the general rule of thumb of =3D< -rc7 - earlier with larg= er changesets. On the other side drm-misc stays open all the time, but makes a cut at -rc6. So everything targetted at v6.8 needs to be in before v6.7-rc6. Heiko _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip