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 X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38307C04AAC for ; Sun, 5 May 2019 22:01:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1A8B206DF for ; Sun, 5 May 2019 22:01:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Fb7tcnhp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728020AbfEEWB1 (ORCPT ); Sun, 5 May 2019 18:01:27 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:36908 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727924AbfEEWB0 (ORCPT ); Sun, 5 May 2019 18:01:26 -0400 Received: from pendragon.ideasonboard.com (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6CF21D5; Mon, 6 May 2019 00:01:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1557093683; bh=GtrM0Lc1y/aKOwP2bNFLcJ3g/UR1KMpksm9IfDe28Qs=; h=Date:From:To:Subject:References:In-Reply-To:From; b=Fb7tcnhp5u9au8pJH492pToQKAmq/f2tR/MKw5dXORu04BdTeCQhyEoa76abv4rYQ kfpaRxRaGtl30MDJBShPVQ9ZFrmsH1C4iPrKQo6GTTPGmKRgLC61VgiL1/6cVZksZ6 prCMBn4PB0bj0UZ6amSxzev5Sdm3auMikP2CKWuQ= Date: Mon, 6 May 2019 01:01:09 +0300 From: Laurent Pinchart To: Sean Paul , dri-devel , Sean Paul , Ville =?utf-8?B?U3lyasOkbMOk?= , Maarten Lankhorst , Maxime Ripard , David Airlie , Linux Kernel Mailing List Subject: Re: [PATCH v3 02/10] drm: Add drm_atomic_crtc_state_for_encoder helper Message-ID: <20190505220109.GD4922@pendragon.ideasonboard.com> References: <20190502194956.218441-1-sean@poorly.run> <20190502194956.218441-3-sean@poorly.run> <20190503081851.GI3271@phenom.ffwll.local> <20190503124737.GH17077@art_vandelay> <20190505211536.GA17751@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190505211536.GA17751@phenom.ffwll.local> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On Sun, May 05, 2019 at 11:15:36PM +0200, Daniel Vetter wrote: > On Fri, May 03, 2019 at 04:06:28PM +0200, Daniel Vetter wrote: > > On Fri, May 3, 2019 at 2:47 PM Sean Paul wrote: > >> On Fri, May 03, 2019 at 10:18:51AM +0200, Daniel Vetter wrote: > >>> On Thu, May 02, 2019 at 03:49:44PM -0400, Sean Paul wrote: > >>>> From: Sean Paul > >>>> > >>>> This patch adds a helper to tease out the currently connected crtc for > >>>> an encoder, along with its state. This follows the same pattern as the > >>>> drm_atomic_crtc_*_for_* macros in the atomic helpers. Since the > >>>> relationship of crtc:encoder is 1:n, we don't need a loop since there is > >>>> only one crtc per encoder. > >>> > >>> No idea which macros you mean, couldn't find them. > >> > >> No longer relevant with the changes below, but for completeness, I was trying to > >> refer to drm_atomic_crtc_state_for_each_plane and friends. I see now that I > >> wasn't terribly clear :) > >> > >>>> Instead of splitting this into 3 functions which all do the same thing, > >>>> this is presented as one function. Perhaps that's too ugly and it should > >>>> be split to: > >>>> struct drm_crtc *drm_atomic_crtc_for_encoder(state, encoder); > >>>> struct drm_crtc_state *drm_atomic_new_crtc_state_for_encoder(state, encoder); > >>>> struct drm_crtc_state *drm_atomic_old_crtc_state_for_encoder(state, encoder); > >>>> > >>>> Suggestions welcome. > >>>> > >>>> Changes in v3: > >>>> - Added to the set > >>>> > >>>> Cc: Daniel Vetter > >>>> Cc: Ville Syrjälä > >>>> Signed-off-by: Sean Paul > >>>> --- > >>>> drivers/gpu/drm/drm_atomic_helper.c | 48 +++++++++++++++++++++++++++++ > >>>> include/drm/drm_atomic_helper.h | 6 ++++ > >>>> 2 files changed, 54 insertions(+) > >>>> > >>>> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > >>>> index 71cc7d6b0644..1f81ca8daad7 100644 > >>>> --- a/drivers/gpu/drm/drm_atomic_helper.c > >>>> +++ b/drivers/gpu/drm/drm_atomic_helper.c > >>>> @@ -3591,3 +3591,51 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > >>>> return ret; > >>>> } > >>>> EXPORT_SYMBOL(drm_atomic_helper_legacy_gamma_set); > >>>> + > >>>> +/** > >>>> + * drm_atomic_crtc_state_for_encoder - Get crtc and new/old state for an encoder > >>>> + * @state: Atomic state > >>>> + * @encoder: The encoder to fetch the crtc information for > >>>> + * @crtc: If not NULL, receives the currently connected crtc > >>>> + * @old_crtc_state: If not NULL, receives the crtc's old state > >>>> + * @new_crtc_state: If not NULL, receives the crtc's new state > >>>> + * > >>>> + * This function finds the crtc which is currently connected to @encoder and > >>>> + * returns it as well as its old and new state. If there is no crtc currently > >>>> + * connected, the function will clear @crtc, @old_crtc_state, @new_crtc_state. > >>>> + * > >>>> + * All of @crtc, @old_crtc_state, and @new_crtc_state are optional. > >>>> + */ > >>>> +void drm_atomic_crtc_state_for_encoder(struct drm_atomic_state *state, > >>>> + struct drm_encoder *encoder, > >>>> + struct drm_crtc **crtc, > >>>> + struct drm_crtc_state **old_crtc_state, > >>>> + struct drm_crtc_state **new_crtc_state) > >>>> +{ > >>>> + struct drm_crtc *tmp_crtc; > >>>> + struct drm_crtc_state *tmp_new_crtc_state, *tmp_old_crtc_state; > >>>> + u32 enc_mask = drm_encoder_mask(encoder); > >>>> + int i; > >>>> + > >>>> + for_each_oldnew_crtc_in_state(state, tmp_crtc, tmp_old_crtc_state, > >>>> + tmp_new_crtc_state, i) { > >>> > >>> So there's two ways to do this: > >>> > >>> - Using encoder_mask, which is a helper thing. In that case I'd rename > >>> this to drm_atomic_helper_crtc_for_encoder. > >>> > >>> - By looping over the connectors, and looking at ->best_encoder and > >>> ->crtc, see drm_encoder_get_crtc in drm_encoder.c. That's the core way > >>> of doing things. In that case call it drm_atomic_crtc_for_encoder, and > >>> put it into drm_atomic.c. > >>> > >>> There's two ways of doing the 2nd one: looping over connectors in a > >>> drm_atomic_state, or the connector list overall. First requires that the > >>> encoder is already in drm_atomic_state (which I think makes sense). > >> > >> Yeah, I wasn't particularly interested in encoders not in state. I had > >> considered going the connector route, but since you can have multiple connectors > >> per encoder, going through crtc seemed a bit more direct. > > > > You can have multiple possible connectors for a given encoder, and > > multiple possible encoders for a given connector. In both cases the > > driver picks for you. But for active encoders and connectors the > > relationship is 1:1. That's what the helpers exploit by looping over > > connectors to get at encoders. > > > >>> Even more complications on old/new_crtc_state: Is that the old state for > >>> the old crtc, or the old state for the new crtc (that can switch too). > >>> Same for the new crtc state ... > >>> > >>> tldr; I'd create 2 functions: > >>> > >>> drm_crtc *drm_atomic_encoder_get_new_crtc(drm_atomic_state *state, encoder) > >>> drm_crtc *drm_atomic_encoder_get_old_crtc(drm_atomic_state *state, encoder) > >>> > >>> With the requirement that they'll return NULL if the encder isn't in in > >>> @state, and implemented using looping over connectors in @state. > >> > >> It seems like we could just tweak this function a bit to get the new or old crtc > >> for an encoder. Any particular reason for going through connector instead? Is it > >> to avoid the encoder_mask which is a helper thing? In that case, perhaps this > >> should use connector links and live in drm_atomic.c? > > > > Well as explained, there's 3 ways you can achieve the same really. I > > do think the "loop over connectors in drm_atomic_state, WARN() if we > > haven't found the encoder you want the crtc for" is probably the most > > solid aproach since it picks up a core atomic concept. But the others > > (looping the connector list, or looping encoder_mask) all work too. > > > > Aside: plane/encoder_mask was added to go from crtc to > > planes/encoders, not really to go the other way round. > > > > Another solution would be to pass the connector_state to all atomic > > encoder hooks, then you could just look at connector_state->crtc. Plus > > you can get at all the other interesting bits and pieces of > > information. In a way this is fallout from us keeping encoders as a > > meaningful concept for easier transition of legacy drivers, while > > still keeping them entirely irrelevant for the actual userspace api > > semantics. > > > > So maybe we want drm_atomic_encoder_get_old/new_connector here. Or > > maybe we even want the full set of functions, i.e. > > drm_atomic_encoder_get_old/new_connector/crtc. > > Laurent just asked me on irc how to get from a bridge to connector > information. Bridge knows its encoder (it's static), so a encode2connector > function would already have a 2nd user with this. > > I.e. I'd say +1 on that approach, and then you can get at the connector > state and whatever else you feel like from there? > > Adding Laurent. Thank you. I'll experiment with this, but please don't wait for me to post a v4. > > In all cases I think only returning the object, not it's state is > > simplest, since then you avoid the confusion of old/new state for > > old/new obj. > > > >>> tldr; this is a lot more tricky than it looks like ... > >>> > >>>> + if (!(tmp_new_crtc_state->encoder_mask & enc_mask)) > >>>> + continue; > >>>> + > >>>> + if (new_crtc_state) > >>>> + *new_crtc_state = tmp_new_crtc_state; > >>>> + if (old_crtc_state) > >>>> + *old_crtc_state = tmp_old_crtc_state; > >>>> + if (crtc) > >>>> + *crtc = tmp_crtc; > >>>> + return; > >>>> + } > >>>> + > >>>> + if (new_crtc_state) > >>>> + *new_crtc_state = NULL; > >>>> + if (old_crtc_state) > >>>> + *old_crtc_state = NULL; > >>>> + if (crtc) > >>>> + *crtc = NULL; > >>>> +} > >>>> +EXPORT_SYMBOL(drm_atomic_crtc_state_for_encoder); > >>>> diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h > >>>> index 58214be3bf3d..2383550a0cc8 100644 > >>>> --- a/include/drm/drm_atomic_helper.h > >>>> +++ b/include/drm/drm_atomic_helper.h > >>>> @@ -153,6 +153,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, > >>>> uint32_t size, > >>>> struct drm_modeset_acquire_ctx *ctx); > >>>> > >>>> +void drm_atomic_crtc_state_for_encoder(struct drm_atomic_state *state, > >>>> + struct drm_encoder *encoder, > >>>> + struct drm_crtc **crtc, > >>>> + struct drm_crtc_state **old_crtc_state, > >>>> + struct drm_crtc_state **new_crtc_state); > >>>> + > >>>> /** > >>>> * drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC > >>>> * @plane: the loop cursor -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v3 02/10] drm: Add drm_atomic_crtc_state_for_encoder helper Date: Mon, 6 May 2019 01:01:09 +0300 Message-ID: <20190505220109.GD4922@pendragon.ideasonboard.com> References: <20190502194956.218441-1-sean@poorly.run> <20190502194956.218441-3-sean@poorly.run> <20190503081851.GI3271@phenom.ffwll.local> <20190503124737.GH17077@art_vandelay> <20190505211536.GA17751@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 88F2F89225 for ; Sun, 5 May 2019 22:01:25 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20190505211536.GA17751@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sean Paul , dri-devel , Sean Paul , Ville =?utf-8?B?U3lyasOkbMOk?= , Maarten Lankhorst , Maxime Ripard , David Airlie , Linux Kernel Mailing List List-Id: dri-devel@lists.freedesktop.org SGVsbG8sCgpPbiBTdW4sIE1heSAwNSwgMjAxOSBhdCAxMToxNTozNlBNICswMjAwLCBEYW5pZWwg VmV0dGVyIHdyb3RlOgo+IE9uIEZyaSwgTWF5IDAzLCAyMDE5IGF0IDA0OjA2OjI4UE0gKzAyMDAs IERhbmllbCBWZXR0ZXIgd3JvdGU6Cj4gPiBPbiBGcmksIE1heSAzLCAyMDE5IGF0IDI6NDcgUE0g U2VhbiBQYXVsIDxzZWFuQHBvb3JseS5ydW4+IHdyb3RlOgo+ID4+IE9uIEZyaSwgTWF5IDAzLCAy MDE5IGF0IDEwOjE4OjUxQU0gKzAyMDAsIERhbmllbCBWZXR0ZXIgd3JvdGU6Cj4gPj4+IE9uIFRo dSwgTWF5IDAyLCAyMDE5IGF0IDAzOjQ5OjQ0UE0gLTA0MDAsIFNlYW4gUGF1bCB3cm90ZToKPiA+ Pj4+IEZyb206IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgo+ID4+Pj4KPiA+Pj4+ IFRoaXMgcGF0Y2ggYWRkcyBhIGhlbHBlciB0byB0ZWFzZSBvdXQgdGhlIGN1cnJlbnRseSBjb25u ZWN0ZWQgY3J0YyBmb3IKPiA+Pj4+IGFuIGVuY29kZXIsIGFsb25nIHdpdGggaXRzIHN0YXRlLiBU aGlzIGZvbGxvd3MgdGhlIHNhbWUgcGF0dGVybiBhcyB0aGUKPiA+Pj4+IGRybV9hdG9taWNfY3J0 Y18qX2Zvcl8qIG1hY3JvcyBpbiB0aGUgYXRvbWljIGhlbHBlcnMuIFNpbmNlIHRoZQo+ID4+Pj4g cmVsYXRpb25zaGlwIG9mIGNydGM6ZW5jb2RlciBpcyAxOm4sIHdlIGRvbid0IG5lZWQgYSBsb29w IHNpbmNlIHRoZXJlIGlzCj4gPj4+PiBvbmx5IG9uZSBjcnRjIHBlciBlbmNvZGVyLgo+ID4+Pgo+ ID4+PiBObyBpZGVhIHdoaWNoIG1hY3JvcyB5b3UgbWVhbiwgY291bGRuJ3QgZmluZCB0aGVtLgo+ ID4+Cj4gPj4gTm8gbG9uZ2VyIHJlbGV2YW50IHdpdGggdGhlIGNoYW5nZXMgYmVsb3csIGJ1dCBm b3IgY29tcGxldGVuZXNzLCBJIHdhcyB0cnlpbmcgdG8KPiA+PiByZWZlciB0byBkcm1fYXRvbWlj X2NydGNfc3RhdGVfZm9yX2VhY2hfcGxhbmUgYW5kIGZyaWVuZHMuIEkgc2VlIG5vdyB0aGF0IEkK PiA+PiB3YXNuJ3QgdGVycmlibHkgY2xlYXIgOikKPiA+Pgo+ID4+Pj4gSW5zdGVhZCBvZiBzcGxp dHRpbmcgdGhpcyBpbnRvIDMgZnVuY3Rpb25zIHdoaWNoIGFsbCBkbyB0aGUgc2FtZSB0aGluZywK PiA+Pj4+IHRoaXMgaXMgcHJlc2VudGVkIGFzIG9uZSBmdW5jdGlvbi4gUGVyaGFwcyB0aGF0J3Mg dG9vIHVnbHkgYW5kIGl0IHNob3VsZAo+ID4+Pj4gYmUgc3BsaXQgdG86Cj4gPj4+PiBzdHJ1Y3Qg ZHJtX2NydGMgKmRybV9hdG9taWNfY3J0Y19mb3JfZW5jb2RlcihzdGF0ZSwgZW5jb2Rlcik7Cj4g Pj4+PiBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmRybV9hdG9taWNfbmV3X2NydGNfc3RhdGVfZm9y X2VuY29kZXIoc3RhdGUsIGVuY29kZXIpOwo+ID4+Pj4gc3RydWN0IGRybV9jcnRjX3N0YXRlICpk cm1fYXRvbWljX29sZF9jcnRjX3N0YXRlX2Zvcl9lbmNvZGVyKHN0YXRlLCBlbmNvZGVyKTsKPiA+ Pj4+Cj4gPj4+PiBTdWdnZXN0aW9ucyB3ZWxjb21lLgo+ID4+Pj4KPiA+Pj4+IENoYW5nZXMgaW4g djM6Cj4gPj4+PiAtIEFkZGVkIHRvIHRoZSBzZXQKPiA+Pj4+Cj4gPj4+PiBDYzogRGFuaWVsIFZl dHRlciA8ZGFuaWVsQGZmd2xsLmNoPgo+ID4+Pj4gQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUu c3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gPj4+PiBTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwg PHNlYW5wYXVsQGNocm9taXVtLm9yZz4KPiA+Pj4+IC0tLQo+ID4+Pj4gIGRyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljX2hlbHBlci5jIHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysK PiA+Pj4+ICBpbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBlci5oICAgICB8ICA2ICsrKysKPiA+ Pj4+ICAyIGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKykKPiA+Pj4+Cj4gPj4+PiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+ID4+Pj4gaW5kZXggNzFjYzdkNmIwNjQ0Li4xZjgx Y2E4ZGFhZDcgMTAwNjQ0Cj4gPj4+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYwo+ID4+Pj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMK PiA+Pj4+IEBAIC0zNTkxLDMgKzM1OTEsNTEgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX2xlZ2Fj eV9nYW1tYV9zZXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ID4+Pj4gICAgIHJldHVybiByZXQ7 Cj4gPj4+PiAgfQo+ID4+Pj4gIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19oZWxwZXJfbGVnYWN5 X2dhbW1hX3NldCk7Cj4gPj4+PiArCj4gPj4+PiArLyoqCj4gPj4+PiArICogZHJtX2F0b21pY19j cnRjX3N0YXRlX2Zvcl9lbmNvZGVyIC0gR2V0IGNydGMgYW5kIG5ldy9vbGQgc3RhdGUgZm9yIGFu IGVuY29kZXIKPiA+Pj4+ICsgKiBAc3RhdGU6IEF0b21pYyBzdGF0ZQo+ID4+Pj4gKyAqIEBlbmNv ZGVyOiBUaGUgZW5jb2RlciB0byBmZXRjaCB0aGUgY3J0YyBpbmZvcm1hdGlvbiBmb3IKPiA+Pj4+ ICsgKiBAY3J0YzogSWYgbm90IE5VTEwsIHJlY2VpdmVzIHRoZSBjdXJyZW50bHkgY29ubmVjdGVk IGNydGMKPiA+Pj4+ICsgKiBAb2xkX2NydGNfc3RhdGU6IElmIG5vdCBOVUxMLCByZWNlaXZlcyB0 aGUgY3J0YydzIG9sZCBzdGF0ZQo+ID4+Pj4gKyAqIEBuZXdfY3J0Y19zdGF0ZTogSWYgbm90IE5V TEwsIHJlY2VpdmVzIHRoZSBjcnRjJ3MgbmV3IHN0YXRlCj4gPj4+PiArICoKPiA+Pj4+ICsgKiBU aGlzIGZ1bmN0aW9uIGZpbmRzIHRoZSBjcnRjIHdoaWNoIGlzIGN1cnJlbnRseSBjb25uZWN0ZWQg dG8gQGVuY29kZXIgYW5kCj4gPj4+PiArICogcmV0dXJucyBpdCBhcyB3ZWxsIGFzIGl0cyBvbGQg YW5kIG5ldyBzdGF0ZS4gSWYgdGhlcmUgaXMgbm8gY3J0YyBjdXJyZW50bHkKPiA+Pj4+ICsgKiBj b25uZWN0ZWQsIHRoZSBmdW5jdGlvbiB3aWxsIGNsZWFyIEBjcnRjLCBAb2xkX2NydGNfc3RhdGUs IEBuZXdfY3J0Y19zdGF0ZS4KPiA+Pj4+ICsgKgo+ID4+Pj4gKyAqIEFsbCBvZiBAY3J0YywgQG9s ZF9jcnRjX3N0YXRlLCBhbmQgQG5ld19jcnRjX3N0YXRlIGFyZSBvcHRpb25hbC4KPiA+Pj4+ICsg Ki8KPiA+Pj4+ICt2b2lkIGRybV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZW5jb2RlcihzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gPj4+PiArICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKPiA+Pj4+ICsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IGRybV9jcnRjICoqY3J0YywKPiA+Pj4+ICsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICoq b2xkX2NydGNfc3RhdGUsCj4gPj4+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqKm5ld19jcnRjX3N0YXRlKQo+ID4+Pj4gK3sKPiA+Pj4+ ICsgICBzdHJ1Y3QgZHJtX2NydGMgKnRtcF9jcnRjOwo+ID4+Pj4gKyAgIHN0cnVjdCBkcm1fY3J0 Y19zdGF0ZSAqdG1wX25ld19jcnRjX3N0YXRlLCAqdG1wX29sZF9jcnRjX3N0YXRlOwo+ID4+Pj4g KyAgIHUzMiBlbmNfbWFzayA9IGRybV9lbmNvZGVyX21hc2soZW5jb2Rlcik7Cj4gPj4+PiArICAg aW50IGk7Cj4gPj4+PiArCj4gPj4+PiArICAgZm9yX2VhY2hfb2xkbmV3X2NydGNfaW5fc3RhdGUo c3RhdGUsIHRtcF9jcnRjLCB0bXBfb2xkX2NydGNfc3RhdGUsCj4gPj4+PiArICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdG1wX25ld19jcnRjX3N0YXRlLCBpKSB7Cj4gPj4+Cj4gPj4+ IFNvIHRoZXJlJ3MgdHdvIHdheXMgdG8gZG8gdGhpczoKPiA+Pj4KPiA+Pj4gLSBVc2luZyBlbmNv ZGVyX21hc2ssIHdoaWNoIGlzIGEgaGVscGVyIHRoaW5nLiBJbiB0aGF0IGNhc2UgSSdkIHJlbmFt ZQo+ID4+PiAgIHRoaXMgdG8gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19mb3JfZW5jb2Rlci4KPiA+ Pj4KPiA+Pj4gLSBCeSBsb29waW5nIG92ZXIgdGhlIGNvbm5lY3RvcnMsIGFuZCBsb29raW5nIGF0 IC0+YmVzdF9lbmNvZGVyIGFuZAo+ID4+PiAgIC0+Y3J0Yywgc2VlIGRybV9lbmNvZGVyX2dldF9j cnRjIGluIGRybV9lbmNvZGVyLmMuIFRoYXQncyB0aGUgY29yZSB3YXkKPiA+Pj4gICBvZiBkb2lu ZyB0aGluZ3MuIEluIHRoYXQgY2FzZSBjYWxsIGl0IGRybV9hdG9taWNfY3J0Y19mb3JfZW5jb2Rl ciwgYW5kCj4gPj4+ICAgcHV0IGl0IGludG8gZHJtX2F0b21pYy5jLgo+ID4+Pgo+ID4+PiBUaGVy ZSdzIHR3byB3YXlzIG9mIGRvaW5nIHRoZSAybmQgb25lOiBsb29waW5nIG92ZXIgY29ubmVjdG9y cyBpbiBhCj4gPj4+IGRybV9hdG9taWNfc3RhdGUsIG9yIHRoZSBjb25uZWN0b3IgbGlzdCBvdmVy YWxsLiBGaXJzdCByZXF1aXJlcyB0aGF0IHRoZQo+ID4+PiBlbmNvZGVyIGlzIGFscmVhZHkgaW4g ZHJtX2F0b21pY19zdGF0ZSAod2hpY2ggSSB0aGluayBtYWtlcyBzZW5zZSkuCj4gPj4KPiA+PiBZ ZWFoLCBJIHdhc24ndCBwYXJ0aWN1bGFybHkgaW50ZXJlc3RlZCBpbiBlbmNvZGVycyBub3QgaW4g c3RhdGUuIEkgaGFkCj4gPj4gY29uc2lkZXJlZCBnb2luZyB0aGUgY29ubmVjdG9yIHJvdXRlLCBi dXQgc2luY2UgeW91IGNhbiBoYXZlIG11bHRpcGxlIGNvbm5lY3RvcnMKPiA+PiBwZXIgZW5jb2Rl ciwgZ29pbmcgdGhyb3VnaCBjcnRjIHNlZW1lZCBhIGJpdCBtb3JlIGRpcmVjdC4KPiA+IAo+ID4g WW91IGNhbiBoYXZlIG11bHRpcGxlIHBvc3NpYmxlIGNvbm5lY3RvcnMgZm9yIGEgZ2l2ZW4gZW5j b2RlciwgYW5kCj4gPiBtdWx0aXBsZSBwb3NzaWJsZSBlbmNvZGVycyBmb3IgYSBnaXZlbiBjb25u ZWN0b3IuIEluIGJvdGggY2FzZXMgdGhlCj4gPiBkcml2ZXIgcGlja3MgZm9yIHlvdS4gQnV0IGZv ciBhY3RpdmUgZW5jb2RlcnMgYW5kIGNvbm5lY3RvcnMgdGhlCj4gPiByZWxhdGlvbnNoaXAgaXMg MToxLiBUaGF0J3Mgd2hhdCB0aGUgaGVscGVycyBleHBsb2l0IGJ5IGxvb3Bpbmcgb3Zlcgo+ID4g Y29ubmVjdG9ycyB0byBnZXQgYXQgZW5jb2RlcnMuCj4gPiAKPiA+Pj4gRXZlbiBtb3JlIGNvbXBs aWNhdGlvbnMgb24gb2xkL25ld19jcnRjX3N0YXRlOiBJcyB0aGF0IHRoZSBvbGQgc3RhdGUgZm9y Cj4gPj4+IHRoZSBvbGQgY3J0Yywgb3IgdGhlIG9sZCBzdGF0ZSBmb3IgdGhlIG5ldyBjcnRjICh0 aGF0IGNhbiBzd2l0Y2ggdG9vKS4KPiA+Pj4gU2FtZSBmb3IgdGhlIG5ldyBjcnRjIHN0YXRlIC4u Lgo+ID4+Pgo+ID4+PiB0bGRyOyBJJ2QgY3JlYXRlIDIgZnVuY3Rpb25zOgo+ID4+Pgo+ID4+PiBk cm1fY3J0YyAqZHJtX2F0b21pY19lbmNvZGVyX2dldF9uZXdfY3J0Yyhkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSwgZW5jb2RlcikKPiA+Pj4gZHJtX2NydGMgKmRybV9hdG9taWNfZW5jb2Rlcl9nZXRf b2xkX2NydGMoZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsIGVuY29kZXIpCj4gPj4+Cj4gPj4+IFdp dGggdGhlIHJlcXVpcmVtZW50IHRoYXQgdGhleSdsbCByZXR1cm4gTlVMTCBpZiB0aGUgZW5jZGVy IGlzbid0IGluIGluCj4gPj4+IEBzdGF0ZSwgYW5kIGltcGxlbWVudGVkIHVzaW5nIGxvb3Bpbmcg b3ZlciBjb25uZWN0b3JzIGluIEBzdGF0ZS4KPiA+Pgo+ID4+IEl0IHNlZW1zIGxpa2Ugd2UgY291 bGQganVzdCB0d2VhayB0aGlzIGZ1bmN0aW9uIGEgYml0IHRvIGdldCB0aGUgbmV3IG9yIG9sZCBj cnRjCj4gPj4gZm9yIGFuIGVuY29kZXIuIEFueSBwYXJ0aWN1bGFyIHJlYXNvbiBmb3IgZ29pbmcg dGhyb3VnaCBjb25uZWN0b3IgaW5zdGVhZD8gSXMgaXQKPiA+PiB0byBhdm9pZCB0aGUgZW5jb2Rl cl9tYXNrIHdoaWNoIGlzIGEgaGVscGVyIHRoaW5nPyBJbiB0aGF0IGNhc2UsIHBlcmhhcHMgdGhp cwo+ID4+IHNob3VsZCB1c2UgY29ubmVjdG9yIGxpbmtzIGFuZCBsaXZlIGluIGRybV9hdG9taWMu Yz8KPiA+IAo+ID4gV2VsbCBhcyBleHBsYWluZWQsIHRoZXJlJ3MgMyB3YXlzIHlvdSBjYW4gYWNo aWV2ZSB0aGUgc2FtZSByZWFsbHkuIEkKPiA+IGRvIHRoaW5rIHRoZSAibG9vcCBvdmVyIGNvbm5l Y3RvcnMgaW4gZHJtX2F0b21pY19zdGF0ZSwgV0FSTigpIGlmIHdlCj4gPiBoYXZlbid0IGZvdW5k IHRoZSBlbmNvZGVyIHlvdSB3YW50IHRoZSBjcnRjIGZvciIgaXMgcHJvYmFibHkgdGhlIG1vc3QK PiA+IHNvbGlkIGFwcm9hY2ggc2luY2UgaXQgcGlja3MgdXAgYSBjb3JlIGF0b21pYyBjb25jZXB0 LiBCdXQgdGhlIG90aGVycwo+ID4gKGxvb3BpbmcgdGhlIGNvbm5lY3RvciBsaXN0LCBvciBsb29w aW5nIGVuY29kZXJfbWFzaykgYWxsIHdvcmsgdG9vLgo+ID4gCj4gPiBBc2lkZTogcGxhbmUvZW5j b2Rlcl9tYXNrIHdhcyBhZGRlZCB0byBnbyBmcm9tIGNydGMgdG8KPiA+IHBsYW5lcy9lbmNvZGVy cywgbm90IHJlYWxseSB0byBnbyB0aGUgb3RoZXIgd2F5IHJvdW5kLgo+ID4gCj4gPiBBbm90aGVy IHNvbHV0aW9uIHdvdWxkIGJlIHRvIHBhc3MgdGhlIGNvbm5lY3Rvcl9zdGF0ZSB0byBhbGwgYXRv bWljCj4gPiBlbmNvZGVyIGhvb2tzLCB0aGVuIHlvdSBjb3VsZCBqdXN0IGxvb2sgYXQgY29ubmVj dG9yX3N0YXRlLT5jcnRjLiBQbHVzCj4gPiB5b3UgY2FuIGdldCBhdCBhbGwgdGhlIG90aGVyIGlu dGVyZXN0aW5nIGJpdHMgYW5kIHBpZWNlcyBvZgo+ID4gaW5mb3JtYXRpb24uIEluIGEgd2F5IHRo aXMgaXMgZmFsbG91dCBmcm9tIHVzIGtlZXBpbmcgZW5jb2RlcnMgYXMgYQo+ID4gbWVhbmluZ2Z1 bCBjb25jZXB0IGZvciBlYXNpZXIgdHJhbnNpdGlvbiBvZiBsZWdhY3kgZHJpdmVycywgd2hpbGUK PiA+IHN0aWxsIGtlZXBpbmcgdGhlbSBlbnRpcmVseSBpcnJlbGV2YW50IGZvciB0aGUgYWN0dWFs IHVzZXJzcGFjZSBhcGkKPiA+IHNlbWFudGljcy4KPiA+IAo+ID4gU28gbWF5YmUgd2Ugd2FudCBk cm1fYXRvbWljX2VuY29kZXJfZ2V0X29sZC9uZXdfY29ubmVjdG9yIGhlcmUuIE9yCj4gPiBtYXli ZSB3ZSBldmVuIHdhbnQgdGhlIGZ1bGwgc2V0IG9mIGZ1bmN0aW9ucywgaS5lLgo+ID4gZHJtX2F0 b21pY19lbmNvZGVyX2dldF9vbGQvbmV3X2Nvbm5lY3Rvci9jcnRjLgo+IAo+IExhdXJlbnQganVz dCBhc2tlZCBtZSBvbiBpcmMgaG93IHRvIGdldCBmcm9tIGEgYnJpZGdlIHRvIGNvbm5lY3Rvcgo+ IGluZm9ybWF0aW9uLiBCcmlkZ2Uga25vd3MgaXRzIGVuY29kZXIgKGl0J3Mgc3RhdGljKSwgc28g YSBlbmNvZGUyY29ubmVjdG9yCj4gZnVuY3Rpb24gd291bGQgYWxyZWFkeSBoYXZlIGEgMm5kIHVz ZXIgd2l0aCB0aGlzLgo+IAo+IEkuZS4gSSdkIHNheSArMSBvbiB0aGF0IGFwcHJvYWNoLCBhbmQg dGhlbiB5b3UgY2FuIGdldCBhdCB0aGUgY29ubmVjdG9yCj4gc3RhdGUgYW5kIHdoYXRldmVyIGVs c2UgeW91IGZlZWwgbGlrZSBmcm9tIHRoZXJlPwo+IAo+IEFkZGluZyBMYXVyZW50LgoKVGhhbmsg eW91LiBJJ2xsIGV4cGVyaW1lbnQgd2l0aCB0aGlzLCBidXQgcGxlYXNlIGRvbid0IHdhaXQgZm9y IG1lIHRvCnBvc3QgYSB2NC4KCj4gPiBJbiBhbGwgY2FzZXMgSSB0aGluayBvbmx5IHJldHVybmlu ZyB0aGUgb2JqZWN0LCBub3QgaXQncyBzdGF0ZSBpcwo+ID4gc2ltcGxlc3QsIHNpbmNlIHRoZW4g eW91IGF2b2lkIHRoZSBjb25mdXNpb24gb2Ygb2xkL25ldyBzdGF0ZSBmb3IKPiA+IG9sZC9uZXcg b2JqLgo+ID4KPiA+Pj4gdGxkcjsgdGhpcyBpcyBhIGxvdCBtb3JlIHRyaWNreSB0aGFuIGl0IGxv b2tzIGxpa2UgLi4uCj4gPj4+Cj4gPj4+PiArICAgICAgICAgICBpZiAoISh0bXBfbmV3X2NydGNf c3RhdGUtPmVuY29kZXJfbWFzayAmIGVuY19tYXNrKSkKPiA+Pj4+ICsgICAgICAgICAgICAgICAg ICAgY29udGludWU7Cj4gPj4+PiArCj4gPj4+PiArICAgICAgICAgICBpZiAobmV3X2NydGNfc3Rh dGUpCj4gPj4+PiArICAgICAgICAgICAgICAgICAgICpuZXdfY3J0Y19zdGF0ZSA9IHRtcF9uZXdf Y3J0Y19zdGF0ZTsKPiA+Pj4+ICsgICAgICAgICAgIGlmIChvbGRfY3J0Y19zdGF0ZSkKPiA+Pj4+ ICsgICAgICAgICAgICAgICAgICAgKm9sZF9jcnRjX3N0YXRlID0gdG1wX29sZF9jcnRjX3N0YXRl Owo+ID4+Pj4gKyAgICAgICAgICAgaWYgKGNydGMpCj4gPj4+PiArICAgICAgICAgICAgICAgICAg ICpjcnRjID0gdG1wX2NydGM7Cj4gPj4+PiArICAgICAgICAgICByZXR1cm47Cj4gPj4+PiArICAg fQo+ID4+Pj4gKwo+ID4+Pj4gKyAgIGlmIChuZXdfY3J0Y19zdGF0ZSkKPiA+Pj4+ICsgICAgICAg ICAgICpuZXdfY3J0Y19zdGF0ZSA9IE5VTEw7Cj4gPj4+PiArICAgaWYgKG9sZF9jcnRjX3N0YXRl KQo+ID4+Pj4gKyAgICAgICAgICAgKm9sZF9jcnRjX3N0YXRlID0gTlVMTDsKPiA+Pj4+ICsgICBp ZiAoY3J0YykKPiA+Pj4+ICsgICAgICAgICAgICpjcnRjID0gTlVMTDsKPiA+Pj4+ICt9Cj4gPj4+ PiArRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2NydGNfc3RhdGVfZm9yX2VuY29kZXIpOwo+ID4+ Pj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmggYi9pbmNsdWRl L2RybS9kcm1fYXRvbWljX2hlbHBlci5oCj4gPj4+PiBpbmRleCA1ODIxNGJlM2JmM2QuLjIzODM1 NTBhMGNjOCAxMDA2NDQKPiA+Pj4+IC0tLSBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVy LmgKPiA+Pj4+ICsrKyBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgKPiA+Pj4+IEBA IC0xNTMsNiArMTUzLDEyIEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9sZWdhY3lfZ2FtbWFfc2V0 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiA+Pj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdWludDMyX3Qgc2l6ZSwKPiA+Pj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpjdHgpOwo+ID4+Pj4KPiA+ Pj4+ICt2b2lkIGRybV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUsCj4gPj4+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKPiA+Pj4+ICsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RydWN0IGRybV9jcnRjICoqY3J0YywKPiA+Pj4+ICsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICoqb2xkX2Ny dGNfc3RhdGUsCj4gPj4+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqKm5ld19jcnRjX3N0YXRlKTsKPiA+Pj4+ICsKPiA+Pj4+ICAvKioK PiA+Pj4+ICAgKiBkcm1fYXRvbWljX2NydGNfZm9yX2VhY2hfcGxhbmUgLSBpdGVyYXRlIG92ZXIg cGxhbmVzIGN1cnJlbnRseSBhdHRhY2hlZCB0byBDUlRDCj4gPj4+PiAgICogQHBsYW5lOiB0aGUg bG9vcCBjdXJzb3IKCi0tIApSZWdhcmRzLAoKTGF1cmVudCBQaW5jaGFydApfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=