From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (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 B146FAD51 for ; Tue, 28 Mar 2023 19:42:07 +0000 (UTC) Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PmKft0KQbz9sbg; Tue, 28 Mar 2023 21:36:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oltmanns.dev; s=MBO0001; t=1680032166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UctDcSLnkPivkt/lZEarG/yH4/UnvtCzaIKp7oU4z5Q=; b=oxD0cpNIO7C5J5hVIgVd6Iyoq+y/5F561v/J+JXWEEPjL3r9fSzW0ylGbbfgo+IfTY8lfs js7zuhBtZ8Zv+WDFXGwe5gWv9HHt91x7yE2ZhX+semyXoenaCOppvTdmrH630d4A+qZef0 eOyhPiASVPpLRu+aH+zlbV7k4bNPNoHYysMv3Mu+Od6PbTXxfG7uYyx0t49uluri/ZBl5x mbZpJb3td4X2cIq2ErlUAwJEOItYB6N6Yr/6X1JyFCCTWwhgMF9MiWapEdz+mMfIj/qvxL Y3oN80duQKuPxnJpjcQqedONgt6SIl/eZPnumD1bnR15ucrC9kteN29tvWKgvQ== References: <20230320161636.24411-1-romanberanek@icloud.com> <87wn356ni4.fsf@oltmanns.dev> <20230327202045.ceeqqwjug4ktxtsf@penduick> From: Frank Oltmanns To: Maxime Ripard Cc: Roman Beranek , Chen-Yu Tsai , David Airlie , Daniel Vetter , Jernej Skrabec , Samuel Holland , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/sun4i: uncouple DSI dotclock divider from TCON0_DCLK_REG Date: Tue, 28 Mar 2023 21:28:19 +0200 In-reply-to: <20230327202045.ceeqqwjug4ktxtsf@penduick> Message-ID: <87bkkc3bzc.fsf@oltmanns.dev> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PmKft0KQbz9sbg Hi, On 2023-03-27 at 22:20:45 +0200, Maxime Ripard wrote: > Hi, > > On Sat, Mar 25, 2023 at 12:40:04PM +0100, Frank Oltmanns wrote: [...] >> Actually, I had the following third patch prepared that adjusted the dot= clock rate so that the >> required PLL rate is set. But again, this seems very indirect, so that= =E2=80=99s why I refrained from >> submitting it and I submitted the linked patch above instead. >> >> Anyway, here is the third proposal: >> >> =E2=80=94 a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >> @@ -819,6 +819,34 @@ static void sun6i_dsi_encoder_disable(struct drm_en= coder *encoder) >> regulator_disable(dsi->regulator); >> } >> >> +static bool sun6i_dsi_encoder_mode_fixup( >> =E2=81=83 struct drm_encoder *encoder, >> =E2=81=83 const struct drm_display_mode *mode, >> =E2=81=83 struct drm_display_mode *adjusted_mode) >> +{ >> =E2=81=83 if (encoder->encoder_type =3D=3D DRM_MODE_ENCODER_DSI) { >> =E2=81=83 /* >> =E2=81=83 * For DSI the PLL rate has to respect the bits per pixel and >> =E2=81=83 * number of lanes. >> =E2=81=83 * >> =E2=81=83 * According to the BSP code: >> =E2=81=83 * PLL rate =3D DOTCLOCK * bpp / lanes >> =E2=81=83 * >> =E2=81=83 * Therefore, the clock has to be adjusted in order to set the >> =E2=81=83 * correct PLL rate when actually setting the clock. >> =E2=81=83 */ >> =E2=81=83 struct sun6i_dsi *dsi =3D encoder_to_sun6i_dsi(encoder); >> =E2=81=83 struct mipi_dsi_device *device =3D dsi->device; >> =E2=81=83 u8 bpp =3D mipi_dsi_pixel_format_to_bpp(device->format); >> =E2=81=83 u8 lanes =3D device->lanes; >> =E2=81=83 >> >> =E2=81=83 adjusted_mode->crtc_clock =3D mode->crtc_clock >> =E2=81=83 * bpp / (lanes * SUN6I_DSI_TCON_DIV); >> =E2=81=83 } >> =E2=81=83 >> >> =E2=81=83 return true; >> +} >> =E2=81=83 static int sun6i_dsi_get_modes(struct drm_connector *connector) >> { >> struct sun6i_dsi *dsi =3D connector_to_sun6i_dsi(connector); >> @@ -851,6 +879,7 @@ static const struct drm_connector_funcs sun6i_dsi_co= nnector_funcs =3D { >> static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs= =3D { >> .disable =3D sun6i_dsi_encoder_disable, >> .enable =3D sun6i_dsi_encoder_enable, >> =E2=81=83 .mode_fixup =3D sun6i_dsi_encoder_mode_fixup, >> }; > > It's not clear to me what this patch is supposed to be doing, there's no = mode_fixup implementation > upstream? > Sorry, my mail client tried some fancy formatting. :( This is the patch again. --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -819,6 +819,34 @@ static void sun6i_dsi_encoder_disable(struct drm_encod= er *encoder) regulator_disable(dsi->regulator); } +static bool sun6i_dsi_encoder_mode_fixup( + struct drm_encoder *encoder, + const struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + if (encoder->encoder_type =3D=3D DRM_MODE_ENCODER_DSI) { + /* + * For DSI the PLL rate has to respect the bits per pixel and + * number of lanes. + * + * According to the BSP code: + * PLL rate =3D DOTCLOCK * bpp / lanes + * + * Therefore, the clock has to be adjusted in order to set the + * correct PLL rate when actually setting the clock. + */ + struct sun6i_dsi *dsi =3D encoder_to_sun6i_dsi(encoder); + struct mipi_dsi_device *device =3D dsi->device; + u8 bpp =3D mipi_dsi_pixel_format_to_bpp(device->format); + u8 lanes =3D device->lanes; + + adjusted_mode->crtc_clock =3D mode->crtc_clock + * bpp / (lanes * SUN6I_DSI_TCON_DIV); + } + + return true; +} + static int sun6i_dsi_get_modes(struct drm_connector *connector) { struct sun6i_dsi *dsi =3D connector_to_sun6i_dsi(connector); @@ -851,6 +879,7 @@ static const struct drm_connector_funcs sun6i_dsi_conne= ctor_funcs =3D { static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = =3D { .disable =3D sun6i_dsi_encoder_disable, .enable =3D sun6i_dsi_encoder_enable, + .mode_fixup =3D sun6i_dsi_encoder_mode_fixup, }; static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, I still like the original patch better, but I'd be happy to submit this as a proper patch, if this is more to your liking. Thanks, Frank > Maxime > -- 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 D4954C76196 for ; Tue, 28 Mar 2023 19:36:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E36C10E0FE; Tue, 28 Mar 2023 19:36:12 +0000 (UTC) Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) by gabe.freedesktop.org (Postfix) with ESMTPS id 69CB310E0FE for ; Tue, 28 Mar 2023 19:36:09 +0000 (UTC) Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PmKft0KQbz9sbg; Tue, 28 Mar 2023 21:36:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oltmanns.dev; s=MBO0001; t=1680032166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UctDcSLnkPivkt/lZEarG/yH4/UnvtCzaIKp7oU4z5Q=; b=oxD0cpNIO7C5J5hVIgVd6Iyoq+y/5F561v/J+JXWEEPjL3r9fSzW0ylGbbfgo+IfTY8lfs js7zuhBtZ8Zv+WDFXGwe5gWv9HHt91x7yE2ZhX+semyXoenaCOppvTdmrH630d4A+qZef0 eOyhPiASVPpLRu+aH+zlbV7k4bNPNoHYysMv3Mu+Od6PbTXxfG7uYyx0t49uluri/ZBl5x mbZpJb3td4X2cIq2ErlUAwJEOItYB6N6Yr/6X1JyFCCTWwhgMF9MiWapEdz+mMfIj/qvxL Y3oN80duQKuPxnJpjcQqedONgt6SIl/eZPnumD1bnR15ucrC9kteN29tvWKgvQ== References: <20230320161636.24411-1-romanberanek@icloud.com> <87wn356ni4.fsf@oltmanns.dev> <20230327202045.ceeqqwjug4ktxtsf@penduick> From: Frank Oltmanns To: Maxime Ripard Subject: Re: [PATCH] drm/sun4i: uncouple DSI dotclock divider from TCON0_DCLK_REG Date: Tue, 28 Mar 2023 21:28:19 +0200 In-reply-to: <20230327202045.ceeqqwjug4ktxtsf@penduick> Message-ID: <87bkkc3bzc.fsf@oltmanns.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PmKft0KQbz9sbg X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Holland , linux-kernel@vger.kernel.org, Jernej Skrabec , Roman Beranek , Chen-Yu Tsai , dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, On 2023-03-27 at 22:20:45 +0200, Maxime Ripard wrote: > Hi, > > On Sat, Mar 25, 2023 at 12:40:04PM +0100, Frank Oltmanns wrote: [...] >> Actually, I had the following third patch prepared that adjusted the dot= clock rate so that the >> required PLL rate is set. But again, this seems very indirect, so that= =E2=80=99s why I refrained from >> submitting it and I submitted the linked patch above instead. >> >> Anyway, here is the third proposal: >> >> =E2=80=94 a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c >> @@ -819,6 +819,34 @@ static void sun6i_dsi_encoder_disable(struct drm_en= coder *encoder) >> regulator_disable(dsi->regulator); >> } >> >> +static bool sun6i_dsi_encoder_mode_fixup( >> =E2=81=83 struct drm_encoder *encoder, >> =E2=81=83 const struct drm_display_mode *mode, >> =E2=81=83 struct drm_display_mode *adjusted_mode) >> +{ >> =E2=81=83 if (encoder->encoder_type =3D=3D DRM_MODE_ENCODER_DSI) { >> =E2=81=83 /* >> =E2=81=83 * For DSI the PLL rate has to respect the bits per pixel and >> =E2=81=83 * number of lanes. >> =E2=81=83 * >> =E2=81=83 * According to the BSP code: >> =E2=81=83 * PLL rate =3D DOTCLOCK * bpp / lanes >> =E2=81=83 * >> =E2=81=83 * Therefore, the clock has to be adjusted in order to set the >> =E2=81=83 * correct PLL rate when actually setting the clock. >> =E2=81=83 */ >> =E2=81=83 struct sun6i_dsi *dsi =3D encoder_to_sun6i_dsi(encoder); >> =E2=81=83 struct mipi_dsi_device *device =3D dsi->device; >> =E2=81=83 u8 bpp =3D mipi_dsi_pixel_format_to_bpp(device->format); >> =E2=81=83 u8 lanes =3D device->lanes; >> =E2=81=83 >> >> =E2=81=83 adjusted_mode->crtc_clock =3D mode->crtc_clock >> =E2=81=83 * bpp / (lanes * SUN6I_DSI_TCON_DIV); >> =E2=81=83 } >> =E2=81=83 >> >> =E2=81=83 return true; >> +} >> =E2=81=83 static int sun6i_dsi_get_modes(struct drm_connector *connector) >> { >> struct sun6i_dsi *dsi =3D connector_to_sun6i_dsi(connector); >> @@ -851,6 +879,7 @@ static const struct drm_connector_funcs sun6i_dsi_co= nnector_funcs =3D { >> static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs= =3D { >> .disable =3D sun6i_dsi_encoder_disable, >> .enable =3D sun6i_dsi_encoder_enable, >> =E2=81=83 .mode_fixup =3D sun6i_dsi_encoder_mode_fixup, >> }; > > It's not clear to me what this patch is supposed to be doing, there's no = mode_fixup implementation > upstream? > Sorry, my mail client tried some fancy formatting. :( This is the patch again. --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -819,6 +819,34 @@ static void sun6i_dsi_encoder_disable(struct drm_encod= er *encoder) regulator_disable(dsi->regulator); } +static bool sun6i_dsi_encoder_mode_fixup( + struct drm_encoder *encoder, + const struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + if (encoder->encoder_type =3D=3D DRM_MODE_ENCODER_DSI) { + /* + * For DSI the PLL rate has to respect the bits per pixel and + * number of lanes. + * + * According to the BSP code: + * PLL rate =3D DOTCLOCK * bpp / lanes + * + * Therefore, the clock has to be adjusted in order to set the + * correct PLL rate when actually setting the clock. + */ + struct sun6i_dsi *dsi =3D encoder_to_sun6i_dsi(encoder); + struct mipi_dsi_device *device =3D dsi->device; + u8 bpp =3D mipi_dsi_pixel_format_to_bpp(device->format); + u8 lanes =3D device->lanes; + + adjusted_mode->crtc_clock =3D mode->crtc_clock + * bpp / (lanes * SUN6I_DSI_TCON_DIV); + } + + return true; +} + static int sun6i_dsi_get_modes(struct drm_connector *connector) { struct sun6i_dsi *dsi =3D connector_to_sun6i_dsi(connector); @@ -851,6 +879,7 @@ static const struct drm_connector_funcs sun6i_dsi_conne= ctor_funcs =3D { static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = =3D { .disable =3D sun6i_dsi_encoder_disable, .enable =3D sun6i_dsi_encoder_enable, + .mode_fixup =3D sun6i_dsi_encoder_mode_fixup, }; static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, I still like the original patch better, but I'd be happy to submit this as a proper patch, if this is more to your liking. Thanks, Frank > Maxime > -- 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 18CF7C76196 for ; Tue, 28 Mar 2023 19:37:25 +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:Message-ID:In-reply-to: Date:Subject:Cc:To:From:References:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NTnK1pLr8A79j75RmuSH3SAYCXfGbmpir7HtJ+hdxlI=; b=NORB8Pm5uVwHVx h3rt2P2gvICCndJ0HhBV6nwwTRd8Zbng6UqgDgwwwFwGfoHRsG9cgpRI6fQhTt2d/r/CWd7vbMT4A zEpILjjheEYTQTRucjh5OQKlTFE+C2Z2ks6S9ic5PSBcBWAo1y6tGyY9YwI2K7DRAj2rPSUv5Ze6u +NsomaPEHnP1AzdOwNkNzsUEt6QeE4+t4B9ZOg3tSFxRgIUXgYADjJKq0oZSbBT4PKl2A+o6tJ/sA xqrwnfE8p4lNOOt2yA8BY8UzLmvmTzRYy+43/fh4NvYzXvFOnI/iQaOeSKRg0T7k274lTJcDTE3IS iTQSp0zcOamI7bmgZRhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phF7A-00FduS-0X; Tue, 28 Mar 2023 19:36:16 +0000 Received: from mout-p-102.mailbox.org ([80.241.56.152]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phF76-00Fdsx-36 for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2023 19:36:14 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PmKft0KQbz9sbg; Tue, 28 Mar 2023 21:36:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oltmanns.dev; s=MBO0001; t=1680032166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UctDcSLnkPivkt/lZEarG/yH4/UnvtCzaIKp7oU4z5Q=; b=oxD0cpNIO7C5J5hVIgVd6Iyoq+y/5F561v/J+JXWEEPjL3r9fSzW0ylGbbfgo+IfTY8lfs js7zuhBtZ8Zv+WDFXGwe5gWv9HHt91x7yE2ZhX+semyXoenaCOppvTdmrH630d4A+qZef0 eOyhPiASVPpLRu+aH+zlbV7k4bNPNoHYysMv3Mu+Od6PbTXxfG7uYyx0t49uluri/ZBl5x mbZpJb3td4X2cIq2ErlUAwJEOItYB6N6Yr/6X1JyFCCTWwhgMF9MiWapEdz+mMfIj/qvxL Y3oN80duQKuPxnJpjcQqedONgt6SIl/eZPnumD1bnR15ucrC9kteN29tvWKgvQ== References: <20230320161636.24411-1-romanberanek@icloud.com> <87wn356ni4.fsf@oltmanns.dev> <20230327202045.ceeqqwjug4ktxtsf@penduick> From: Frank Oltmanns To: Maxime Ripard Cc: Roman Beranek , Chen-Yu Tsai , David Airlie , Daniel Vetter , Jernej Skrabec , Samuel Holland , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/sun4i: uncouple DSI dotclock divider from TCON0_DCLK_REG Date: Tue, 28 Mar 2023 21:28:19 +0200 In-reply-to: <20230327202045.ceeqqwjug4ktxtsf@penduick> Message-ID: <87bkkc3bzc.fsf@oltmanns.dev> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PmKft0KQbz9sbg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230328_123613_221615_6368036C X-CRM114-Status: GOOD ( 20.54 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CkhpLAoKT24gMjAyMy0wMy0yNyBhdCAyMjoyMDo0NSArMDIwMCwgTWF4aW1lIFJpcGFyZCA8bWF4 aW1lQGNlcm5vLnRlY2g+IHdyb3RlOgo+IEhpLAo+Cj4gT24gU2F0LCBNYXIgMjUsIDIwMjMgYXQg MTI6NDA6MDRQTSArMDEwMCwgRnJhbmsgT2x0bWFubnMgd3JvdGU6ClsuLi5dCj4+IEFjdHVhbGx5 LCBJIGhhZCB0aGUgZm9sbG93aW5nIHRoaXJkIHBhdGNoIHByZXBhcmVkIHRoYXQgYWRqdXN0ZWQg dGhlIGRvdGNsb2NrIHJhdGUgc28gdGhhdCB0aGUKPj4gcmVxdWlyZWQgUExMIHJhdGUgaXMgc2V0 LiBCdXQgYWdhaW4sIHRoaXMgc2VlbXMgdmVyeSBpbmRpcmVjdCwgc28gdGhhdOKAmXMgd2h5IEkg cmVmcmFpbmVkIGZyb20KPj4gc3VibWl0dGluZyBpdCBhbmQgSSBzdWJtaXR0ZWQgdGhlIGxpbmtl ZCBwYXRjaCBhYm92ZSBpbnN0ZWFkLgo+Pgo+PiBBbnl3YXksIGhlcmUgaXMgdGhlIHRoaXJkIHBy b3Bvc2FsOgo+Pgo+PiDigJQgYS9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNmlfbWlwaV9kc2ku Ywo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNmlfbWlwaV9kc2kuYwo+PiBAQCAt ODE5LDYgKzgxOSwzNCBAQCBzdGF0aWMgdm9pZCBzdW42aV9kc2lfZW5jb2Rlcl9kaXNhYmxlKHN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKPj4gIAlyZWd1bGF0b3JfZGlzYWJsZShkc2ktPnJl Z3VsYXRvcik7Cj4+ICB9Cj4+Cj4+ICtzdGF0aWMgYm9vbCBzdW42aV9kc2lfZW5jb2Rlcl9tb2Rl X2ZpeHVwKAo+PiDigYMgc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAo+PiDigYMgY29uc3Qg c3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUsCj4+IOKBgyBzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqYWRqdXN0ZWRfbW9kZSkKPj4gK3sKPj4g4oGDIGlmIChlbmNvZGVyLT5lbmNvZGVyX3R5 cGUgPT0gRFJNX01PREVfRU5DT0RFUl9EU0kpIHsKPj4g4oGDIC8qCj4+IOKBgyAqIEZvciBEU0kg dGhlIFBMTCByYXRlIGhhcyB0byByZXNwZWN0IHRoZSBiaXRzIHBlciBwaXhlbCBhbmQKPj4g4oGD ICogbnVtYmVyIG9mIGxhbmVzLgo+PiDigYMgKgo+PiDigYMgKiBBY2NvcmRpbmcgdG8gdGhlIEJT UCBjb2RlOgo+PiDigYMgKiBQTEwgcmF0ZSA9IERPVENMT0NLICogYnBwIC8gbGFuZXMKPj4g4oGD ICoKPj4g4oGDICogVGhlcmVmb3JlLCB0aGUgY2xvY2sgaGFzIHRvIGJlIGFkanVzdGVkIGluIG9y ZGVyIHRvIHNldCB0aGUKPj4g4oGDICogY29ycmVjdCBQTEwgcmF0ZSB3aGVuIGFjdHVhbGx5IHNl dHRpbmcgdGhlIGNsb2NrLgo+PiDigYMgKi8KPj4g4oGDIHN0cnVjdCBzdW42aV9kc2kgKmRzaSA9 IGVuY29kZXJfdG9fc3VuNmlfZHNpKGVuY29kZXIpOwo+PiDigYMgc3RydWN0IG1pcGlfZHNpX2Rl dmljZSAqZGV2aWNlID0gZHNpLT5kZXZpY2U7Cj4+IOKBgyB1OCBicHAgPSBtaXBpX2RzaV9waXhl bF9mb3JtYXRfdG9fYnBwKGRldmljZS0+Zm9ybWF0KTsKPj4g4oGDIHU4IGxhbmVzID0gZGV2aWNl LT5sYW5lczsKPj4g4oGDCj4+Cj4+IOKBgyBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrID0gbW9k ZS0+Y3J0Y19jbG9jawo+PiDigYMgKiBicHAgLyAobGFuZXMgKiBTVU42SV9EU0lfVENPTl9ESVYp Owo+PiDigYMgfQo+PiDigYMKPj4KPj4g4oGDIHJldHVybiB0cnVlOwo+PiArfQo+PiDigYMgc3Rh dGljIGludCBzdW42aV9kc2lfZ2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3IpCj4+ICAgewo+PiAgICAgICBzdHJ1Y3Qgc3VuNmlfZHNpICpkc2kgPSBjb25uZWN0b3JfdG9f c3VuNmlfZHNpKGNvbm5lY3Rvcik7Cj4+IEBAIC04NTEsNiArODc5LDcgQEAgc3RhdGljIGNvbnN0 IHN0cnVjdCBkcm1fY29ubmVjdG9yX2Z1bmNzIHN1bjZpX2RzaV9jb25uZWN0b3JfZnVuY3MgPSB7 Cj4+ICBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2hlbHBlcl9mdW5jcyBzdW42aV9k c2lfZW5jX2hlbHBlcl9mdW5jcyA9IHsKPj4gIAkuZGlzYWJsZQk9IHN1bjZpX2RzaV9lbmNvZGVy X2Rpc2FibGUsCj4+ICAJLmVuYWJsZQkJPSBzdW42aV9kc2lfZW5jb2Rlcl9lbmFibGUsCj4+IOKB gyAubW9kZV9maXh1cCA9IHN1bjZpX2RzaV9lbmNvZGVyX21vZGVfZml4dXAsCj4+ICAgfTsKPgo+ IEl0J3Mgbm90IGNsZWFyIHRvIG1lIHdoYXQgdGhpcyBwYXRjaCBpcyBzdXBwb3NlZCB0byBiZSBk b2luZywgdGhlcmUncyBubyBtb2RlX2ZpeHVwIGltcGxlbWVudGF0aW9uCj4gdXBzdHJlYW0/Cj4K ClNvcnJ5LCBteSBtYWlsIGNsaWVudCB0cmllZCBzb21lIGZhbmN5IGZvcm1hdHRpbmcuIDooCgpU aGlzIGlzIHRoZSBwYXRjaCBhZ2Fpbi4KCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW42 aV9taXBpX2RzaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9zdW42aV9taXBpX2RzaS5j CkBAIC04MTksNiArODE5LDM0IEBAIHN0YXRpYyB2b2lkIHN1bjZpX2RzaV9lbmNvZGVyX2Rpc2Fi bGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCXJlZ3VsYXRvcl9kaXNhYmxlKGRzaS0+ cmVndWxhdG9yKTsKIH0KCitzdGF0aWMgYm9vbCBzdW42aV9kc2lfZW5jb2Rlcl9tb2RlX2ZpeHVw KAorCQkJCSAgIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKKwkJCQkgICBjb25zdCBzdHJ1 Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKKwkJCQkgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9k ZSAqYWRqdXN0ZWRfbW9kZSkKK3sKKwlpZiAoZW5jb2Rlci0+ZW5jb2Rlcl90eXBlID09IERSTV9N T0RFX0VOQ09ERVJfRFNJKSB7CisJCS8qCisJCSAqIEZvciBEU0kgdGhlIFBMTCByYXRlIGhhcyB0 byByZXNwZWN0IHRoZSBiaXRzIHBlciBwaXhlbCBhbmQKKwkJICogbnVtYmVyIG9mIGxhbmVzLgor CQkgKgorCQkgKiBBY2NvcmRpbmcgdG8gdGhlIEJTUCBjb2RlOgorCQkgKiBQTEwgcmF0ZSA9IERP VENMT0NLICogYnBwIC8gbGFuZXMKKwkJICoKKwkJICogVGhlcmVmb3JlLCB0aGUgY2xvY2sgaGFz IHRvIGJlIGFkanVzdGVkIGluIG9yZGVyIHRvIHNldCB0aGUKKwkJICogY29ycmVjdCBQTEwgcmF0 ZSB3aGVuIGFjdHVhbGx5IHNldHRpbmcgdGhlIGNsb2NrLgorCQkgKi8KKwkJc3RydWN0IHN1bjZp X2RzaSAqZHNpID0gZW5jb2Rlcl90b19zdW42aV9kc2koZW5jb2Rlcik7CisJCXN0cnVjdCBtaXBp X2RzaV9kZXZpY2UgKmRldmljZSA9IGRzaS0+ZGV2aWNlOworCQl1OCBicHAgPSBtaXBpX2RzaV9w aXhlbF9mb3JtYXRfdG9fYnBwKGRldmljZS0+Zm9ybWF0KTsKKwkJdTggbGFuZXMgPSBkZXZpY2Ut PmxhbmVzOworCisJCWFkanVzdGVkX21vZGUtPmNydGNfY2xvY2sgPSBtb2RlLT5jcnRjX2Nsb2Nr CisJCQkJICogYnBwIC8gKGxhbmVzICogU1VONklfRFNJX1RDT05fRElWKTsKKwl9CisKKwlyZXR1 cm4gdHJ1ZTsKK30KKwogc3RhdGljIGludCBzdW42aV9kc2lfZ2V0X21vZGVzKHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IHN1bjZpX2RzaSAqZHNpID0gY29ubmVj dG9yX3RvX3N1bjZpX2RzaShjb25uZWN0b3IpOwpAQCAtODUxLDYgKzg3OSw3IEBAIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5jcyBzdW42aV9kc2lfY29ubmVjdG9yX2Z1bmNz ID0gewogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3Mgc3VuNmlf ZHNpX2VuY19oZWxwZXJfZnVuY3MgPSB7CiAJLmRpc2FibGUJPSBzdW42aV9kc2lfZW5jb2Rlcl9k aXNhYmxlLAogCS5lbmFibGUJCT0gc3VuNmlfZHNpX2VuY29kZXJfZW5hYmxlLAorCS5tb2RlX2Zp eHVwCT0gc3VuNmlfZHNpX2VuY29kZXJfbW9kZV9maXh1cCwKIH07Cgogc3RhdGljIHUzMiBzdW42 aV9kc2lfZGNzX2J1aWxkX3BrdF9oZHIoc3RydWN0IHN1bjZpX2RzaSAqZHNpLAoKCkkgc3RpbGwg bGlrZSB0aGUgb3JpZ2luYWwgcGF0Y2ggYmV0dGVyLCBidXQgSSdkIGJlIGhhcHB5IHRvIHN1Ym1p dCB0aGlzCmFzIGEgcHJvcGVyIHBhdGNoLCBpZiB0aGlzIGlzIG1vcmUgdG8geW91ciBsaWtpbmcu CgpUaGFua3MsCiAgRnJhbmsKCgo+IE1heGltZQo+Ci0tCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdAps aW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVh ZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==