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.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 E2F17C432C0 for ; Mon, 2 Dec 2019 17:03:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABF7820848 for ; Mon, 2 Dec 2019 17:03:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="apOvdzYF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727655AbfLBRDr (ORCPT ); Mon, 2 Dec 2019 12:03:47 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:37456 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727601AbfLBRDr (ORCPT ); Mon, 2 Dec 2019 12:03:47 -0500 Received: from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4AE5E309; Mon, 2 Dec 2019 18:03:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1575306223; bh=8B+MR8jgFupVuPJxryWnFCiBjXyLZ/cVdPkv8Ba1+qM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=apOvdzYFSdlagm+i+zqVCUMIKhvVQTzAhyK/NVntLaQyfQAfj1cUTyY85wattpfR5 bWJfCxdHdbYmaV86h4Bv1eHLjqak2qi1PzM4/ssWApc9ZUEGkDsHBr5oh0D/Ktxbzv fPQdZ28aHvO/LUaJ4HHXfD6RrwN3+4qNCW21rS4k= Date: Mon, 2 Dec 2019 19:03:36 +0200 From: Laurent Pinchart To: Boris Brezillon Cc: dri-devel@lists.freedesktop.org, Lucas Stach , Chris Healy , Andrey Smirnov , Nikita Yushchenko , kernel@collabora.com, Daniel Vetter , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Thierry Reding , Sam Ravnborg , Philipp Zabel , Rob Clark , Andrzej Hajda , Neil Armstrong , Jonas Karlman , Jernej Skrabec , Rob Herring , Mark Rutland , devicetree@vger.kernel.org Subject: Re: [PATCH v3 12/21] drm/bridge: Add an ->atomic_check() hook Message-ID: <20191202170336.GP4929@pendragon.ideasonboard.com> References: <20191023154512.9762-1-boris.brezillon@collabora.com> <20191023154512.9762-13-boris.brezillon@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191023154512.9762-13-boris.brezillon@collabora.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Boris, Thank you for the patch. On Wed, Oct 23, 2019 at 05:45:03PM +0200, Boris Brezillon wrote: > So that bridge drivers have a way to check/reject an atomic operation. > The drm_atomic_bridge_chain_check() (which is just a wrapper around > the ->atomic_check() hook) is called in place of > drm_bridge_chain_mode_fixup() (when ->atomic_check() is not implemented, > the core falls back on ->mode_fixup(), so the behavior should stay > the same for existing bridge drivers). > > Signed-off-by: Boris Brezillon > --- > Changes in v3: > * None > > Changes in v2: > * Clarify the fact that ->atomic_check() is replacing ->mode_fixup() > --- > drivers/gpu/drm/drm_atomic_helper.c | 12 +++--- > drivers/gpu/drm/drm_bridge.c | 62 +++++++++++++++++++++++++++++ > include/drm/drm_bridge.h | 29 +++++++++++++- > 3 files changed, 96 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index de985ba7ce2d..1d0a19511a0d 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -437,12 +437,12 @@ mode_fixup(struct drm_atomic_state *state) > funcs = encoder->helper_private; > > bridge = drm_bridge_chain_get_first_bridge(encoder); > - ret = drm_bridge_chain_mode_fixup(bridge, > - &new_crtc_state->mode, > - &new_crtc_state->adjusted_mode); > - if (!ret) { > - DRM_DEBUG_ATOMIC("Bridge fixup failed\n"); > - return -EINVAL; > + ret = drm_atomic_bridge_chain_check(bridge, > + new_crtc_state, > + new_conn_state); > + if (ret) { > + DRM_DEBUG_ATOMIC("Bridge atomic check failed\n"); > + return ret; > } > > if (funcs && funcs->atomic_check) { > diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c > index 377866e3214f..990e056296bd 100644 > --- a/drivers/gpu/drm/drm_bridge.c > +++ b/drivers/gpu/drm/drm_bridge.c > @@ -615,6 +615,68 @@ void drm_atomic_bridge_chain_enable(struct drm_bridge *bridge, > } > EXPORT_SYMBOL(drm_atomic_bridge_chain_enable); > > +static int drm_atomic_bridge_check(struct drm_bridge *bridge, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state) > +{ > + if (bridge->funcs->atomic_check) { > + struct drm_bridge_state *bridge_state; > + int ret; > + > + bridge_state = drm_atomic_get_new_bridge_state(crtc_state->state, > + bridge); > + if (WARN_ON(!bridge_state)) > + return -EINVAL; > + > + ret = bridge->funcs->atomic_check(bridge, bridge_state, > + crtc_state, conn_state); > + if (ret) > + return ret; > + } else if (bridge->funcs->mode_fixup) { > + if (!bridge->funcs->mode_fixup(bridge, &crtc_state->mode, > + &crtc_state->adjusted_mode)) > + return -EINVAL; > + } > + > + return 0; > +} > + > +/** > + * drm_atomic_bridge_chain_check() - Do an atomic check on the bridge chain > + * @bridge: bridge control structure > + * @crtc_state: new CRTC state > + * @conn_state: new connector state > + * > + * Calls &drm_bridge_funcs.atomic_check() (falls back on > + * &drm_bridge_funcs.mode_fixup()) op for all the bridges in the encoder chain, > + * starting from the last bridge to the first. These are called before calling > + * &drm_encoder_helper_funcs.atomic_check() > + * > + * RETURNS: > + * 0 on success, a negative error code on failure > + */ > +int drm_atomic_bridge_chain_check(struct drm_bridge *bridge, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state) > +{ > + struct drm_encoder *encoder = bridge->encoder; > + struct drm_bridge *iter; > + > + list_for_each_entry_reverse(iter, &encoder->bridge_chain, chain_node) { > + int ret; > + > + ret = drm_atomic_bridge_check(iter, crtc_state, conn_state); > + if (ret) > + return ret; > + > + if (iter == bridge) > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL(drm_atomic_bridge_chain_check); > + > /** > * drm_atomic_helper_bridge_destroy_state() - Default destroy state helper > * @bridge: the bridge this state refers to > diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h > index b1f557d8dba9..2beb1ef9a733 100644 > --- a/include/drm/drm_bridge.h > +++ b/include/drm/drm_bridge.h > @@ -127,7 +127,9 @@ struct drm_bridge_funcs { > * this function passes all other callbacks must succeed for this > * configuration. > * > - * The @mode_fixup callback is optional. > + * The mode_fixup callback is optional. &drm_bridge_funcs.mode_fixup() > + * is not called when &drm_bridge_funcs.atomic_check() is implemented, > + * so only one of them should be provided. > * > * NOTE: > * > @@ -391,6 +393,28 @@ struct drm_bridge_funcs { > void (*atomic_destroy_state)(struct drm_bridge *bridge, > struct drm_bridge_state *state); > > + /** > + * @atomic_check: > + * > + * This method is responsible for checking bridge state correctness. > + * It can also check the state of the surrounding components in chain > + * to make sure the whole pipeline can work properly. As explained in the review of the RFC, I think it's a mistake not to define the semantics of this operation precisely, and in particular not to define explictly what parameters bridge drivers are allowed to modify here. I however don't want to make this a prerequisite for your series, so Reviewed-by: Laurent Pinchart but I'm sure we'll regret this later when different bridges will have slightly incompatible implementations. > + * > + * &drm_bridge_funcs.atomic_check() hooks are called in reverse > + * order (from the last to the first bridge). > + * > + * This method is optional. &drm_bridge_funcs.mode_fixup() is not > + * called when &drm_bridge_funcs.atomic_check() is implemented, so only > + * one of them should be provided. > + * > + * RETURNS: > + * zero if the check passed, a negative error code otherwise. > + */ > + int (*atomic_check)(struct drm_bridge *bridge, > + struct drm_bridge_state *bridge_state, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state); > + > /** > * @atomic_reset: > * > @@ -542,6 +566,9 @@ void drm_bridge_chain_mode_set(struct drm_bridge *bridge, > void drm_bridge_chain_pre_enable(struct drm_bridge *bridge); > void drm_bridge_chain_enable(struct drm_bridge *bridge); > > +int drm_atomic_bridge_chain_check(struct drm_bridge *bridge, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state); > void drm_atomic_bridge_chain_disable(struct drm_bridge *bridge, > struct drm_atomic_state *state); > void drm_atomic_bridge_chain_post_disable(struct drm_bridge *bridge, -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v3 12/21] drm/bridge: Add an ->atomic_check() hook Date: Mon, 2 Dec 2019 19:03:36 +0200 Message-ID: <20191202170336.GP4929@pendragon.ideasonboard.com> References: <20191023154512.9762-1-boris.brezillon@collabora.com> <20191023154512.9762-13-boris.brezillon@collabora.com> 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 [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD22F6E262 for ; Mon, 2 Dec 2019 17:03:45 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20191023154512.9762-13-boris.brezillon@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Boris Brezillon Cc: Mark Rutland , Neil Armstrong , dri-devel@lists.freedesktop.org, Thierry Reding , kernel@collabora.com, Sam Ravnborg , Nikita Yushchenko , Andrey Smirnov , Kyungmin Park , Chris Healy , devicetree@vger.kernel.org, Jonas Karlman , Rob Herring , Jernej Skrabec , Seung-Woo Kim List-Id: dri-devel@lists.freedesktop.org SGkgQm9yaXMsCgpUaGFuayB5b3UgZm9yIHRoZSBwYXRjaC4KCk9uIFdlZCwgT2N0IDIzLCAyMDE5 IGF0IDA1OjQ1OjAzUE0gKzAyMDAsIEJvcmlzIEJyZXppbGxvbiB3cm90ZToKPiBTbyB0aGF0IGJy aWRnZSBkcml2ZXJzIGhhdmUgYSB3YXkgdG8gY2hlY2svcmVqZWN0IGFuIGF0b21pYyBvcGVyYXRp b24uCj4gVGhlIGRybV9hdG9taWNfYnJpZGdlX2NoYWluX2NoZWNrKCkgKHdoaWNoIGlzIGp1c3Qg YSB3cmFwcGVyIGFyb3VuZAo+IHRoZSAtPmF0b21pY19jaGVjaygpIGhvb2spIGlzIGNhbGxlZCBp biBwbGFjZSBvZgo+IGRybV9icmlkZ2VfY2hhaW5fbW9kZV9maXh1cCgpICh3aGVuIC0+YXRvbWlj X2NoZWNrKCkgaXMgbm90IGltcGxlbWVudGVkLAo+IHRoZSBjb3JlIGZhbGxzIGJhY2sgb24gLT5t b2RlX2ZpeHVwKCksIHNvIHRoZSBiZWhhdmlvciBzaG91bGQgc3RheQo+IHRoZSBzYW1lIGZvciBl eGlzdGluZyBicmlkZ2UgZHJpdmVycykuCj4gCj4gU2lnbmVkLW9mZi1ieTogQm9yaXMgQnJlemls bG9uIDxib3Jpcy5icmV6aWxsb25AY29sbGFib3JhLmNvbT4KPiAtLS0KPiBDaGFuZ2VzIGluIHYz Ogo+ICogTm9uZQo+IAo+IENoYW5nZXMgaW4gdjI6Cj4gKiBDbGFyaWZ5IHRoZSBmYWN0IHRoYXQg LT5hdG9taWNfY2hlY2soKSBpcyByZXBsYWNpbmcgLT5tb2RlX2ZpeHVwKCkKPiAtLS0KPiAgZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCAxMiArKystLS0KPiAgZHJpdmVycy9n cHUvZHJtL2RybV9icmlkZ2UuYyAgICAgICAgfCA2MiArKysrKysrKysrKysrKysrKysrKysrKysr KysrKwo+ICBpbmNsdWRlL2RybS9kcm1fYnJpZGdlLmggICAgICAgICAgICB8IDI5ICsrKysrKysr KysrKystCj4gIDMgZmlsZXMgY2hhbmdlZCwgOTYgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMo LSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+IGluZGV4IGRlOTg1YmE3Y2Uy ZC4uMWQwYTE5NTExYTBkIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj X2hlbHBlci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiBA QCAtNDM3LDEyICs0MzcsMTIgQEAgbW9kZV9maXh1cChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCj4gIAkJZnVuY3MgPSBlbmNvZGVyLT5oZWxwZXJfcHJpdmF0ZTsKPiAgCj4gIAkJYnJp ZGdlID0gZHJtX2JyaWRnZV9jaGFpbl9nZXRfZmlyc3RfYnJpZGdlKGVuY29kZXIpOwo+IC0JCXJl dCA9IGRybV9icmlkZ2VfY2hhaW5fbW9kZV9maXh1cChicmlkZ2UsCj4gLQkJCQkJJm5ld19jcnRj X3N0YXRlLT5tb2RlLAo+IC0JCQkJCSZuZXdfY3J0Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZSk7Cj4g LQkJaWYgKCFyZXQpIHsKPiAtCQkJRFJNX0RFQlVHX0FUT01JQygiQnJpZGdlIGZpeHVwIGZhaWxl ZFxuIik7Cj4gLQkJCXJldHVybiAtRUlOVkFMOwo+ICsJCXJldCA9IGRybV9hdG9taWNfYnJpZGdl X2NoYWluX2NoZWNrKGJyaWRnZSwKPiArCQkJCQkJICAgIG5ld19jcnRjX3N0YXRlLAo+ICsJCQkJ CQkgICAgbmV3X2Nvbm5fc3RhdGUpOwo+ICsJCWlmIChyZXQpIHsKPiArCQkJRFJNX0RFQlVHX0FU T01JQygiQnJpZGdlIGF0b21pYyBjaGVjayBmYWlsZWRcbiIpOwo+ICsJCQlyZXR1cm4gcmV0Owo+ ICAJCX0KPiAgCj4gIAkJaWYgKGZ1bmNzICYmIGZ1bmNzLT5hdG9taWNfY2hlY2spIHsKPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9icmlkZ2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fYnJpZGdlLmMKPiBpbmRleCAzNzc4NjZlMzIxNGYuLjk5MGUwNTYyOTZiZCAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2JyaWRnZS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2RybV9icmlkZ2UuYwo+IEBAIC02MTUsNiArNjE1LDY4IEBAIHZvaWQgZHJtX2F0b21pY19icmlk Z2VfY2hhaW5fZW5hYmxlKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UsCj4gIH0KPiAgRVhQT1JU X1NZTUJPTChkcm1fYXRvbWljX2JyaWRnZV9jaGFpbl9lbmFibGUpOwo+ICAKPiArc3RhdGljIGlu dCBkcm1fYXRvbWljX2JyaWRnZV9jaGVjayhzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlLAo+ICsJ CQkJICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAo+ICsJCQkJICAgc3RydWN0 IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCj4gK3sKPiArCWlmIChicmlkZ2UtPmZ1 bmNzLT5hdG9taWNfY2hlY2spIHsKPiArCQlzdHJ1Y3QgZHJtX2JyaWRnZV9zdGF0ZSAqYnJpZGdl X3N0YXRlOwo+ICsJCWludCByZXQ7Cj4gKwo+ICsJCWJyaWRnZV9zdGF0ZSA9IGRybV9hdG9taWNf Z2V0X25ld19icmlkZ2Vfc3RhdGUoY3J0Y19zdGF0ZS0+c3RhdGUsCj4gKwkJCQkJCQkgICAgICAg YnJpZGdlKTsKPiArCQlpZiAoV0FSTl9PTighYnJpZGdlX3N0YXRlKSkKPiArCQkJcmV0dXJuIC1F SU5WQUw7Cj4gKwo+ICsJCXJldCA9IGJyaWRnZS0+ZnVuY3MtPmF0b21pY19jaGVjayhicmlkZ2Us IGJyaWRnZV9zdGF0ZSwKPiArCQkJCQkJICBjcnRjX3N0YXRlLCBjb25uX3N0YXRlKTsKPiArCQlp ZiAocmV0KQo+ICsJCQlyZXR1cm4gcmV0Owo+ICsJfSBlbHNlIGlmIChicmlkZ2UtPmZ1bmNzLT5t b2RlX2ZpeHVwKSB7Cj4gKwkJaWYgKCFicmlkZ2UtPmZ1bmNzLT5tb2RlX2ZpeHVwKGJyaWRnZSwg JmNydGNfc3RhdGUtPm1vZGUsCj4gKwkJCQkJICAgICAgICZjcnRjX3N0YXRlLT5hZGp1c3RlZF9t b2RlKSkKPiArCQkJcmV0dXJuIC1FSU5WQUw7Cj4gKwl9Cj4gKwo+ICsJcmV0dXJuIDA7Cj4gK30K PiArCj4gKy8qKgo+ICsgKiBkcm1fYXRvbWljX2JyaWRnZV9jaGFpbl9jaGVjaygpIC0gRG8gYW4g YXRvbWljIGNoZWNrIG9uIHRoZSBicmlkZ2UgY2hhaW4KPiArICogQGJyaWRnZTogYnJpZGdlIGNv bnRyb2wgc3RydWN0dXJlCj4gKyAqIEBjcnRjX3N0YXRlOiBuZXcgQ1JUQyBzdGF0ZQo+ICsgKiBA Y29ubl9zdGF0ZTogbmV3IGNvbm5lY3RvciBzdGF0ZQo+ICsgKgo+ICsgKiBDYWxscyAmZHJtX2Jy aWRnZV9mdW5jcy5hdG9taWNfY2hlY2soKSAoZmFsbHMgYmFjayBvbgo+ICsgKiAmZHJtX2JyaWRn ZV9mdW5jcy5tb2RlX2ZpeHVwKCkpIG9wIGZvciBhbGwgdGhlIGJyaWRnZXMgaW4gdGhlIGVuY29k ZXIgY2hhaW4sCj4gKyAqIHN0YXJ0aW5nIGZyb20gdGhlIGxhc3QgYnJpZGdlIHRvIHRoZSBmaXJz dC4gVGhlc2UgYXJlIGNhbGxlZCBiZWZvcmUgY2FsbGluZwo+ICsgKiAmZHJtX2VuY29kZXJfaGVs cGVyX2Z1bmNzLmF0b21pY19jaGVjaygpCj4gKyAqCj4gKyAqIFJFVFVSTlM6Cj4gKyAqIDAgb24g c3VjY2VzcywgYSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1cmUKPiArICovCj4gK2ludCBk cm1fYXRvbWljX2JyaWRnZV9jaGFpbl9jaGVjayhzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlLAo+ ICsJCQkJICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCj4gKwkJCQkgIHN0cnVj dCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQo+ICt7Cj4gKwlzdHJ1Y3QgZHJtX2Vu Y29kZXIgKmVuY29kZXIgPSBicmlkZ2UtPmVuY29kZXI7Cj4gKwlzdHJ1Y3QgZHJtX2JyaWRnZSAq aXRlcjsKPiArCj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5X3JldmVyc2UoaXRlciwgJmVuY29kZXIt PmJyaWRnZV9jaGFpbiwgY2hhaW5fbm9kZSkgewo+ICsJCWludCByZXQ7Cj4gKwo+ICsJCXJldCA9 IGRybV9hdG9taWNfYnJpZGdlX2NoZWNrKGl0ZXIsIGNydGNfc3RhdGUsIGNvbm5fc3RhdGUpOwo+ ICsJCWlmIChyZXQpCj4gKwkJCXJldHVybiByZXQ7Cj4gKwo+ICsJCWlmIChpdGVyID09IGJyaWRn ZSkKPiArCQkJYnJlYWs7Cj4gKwl9Cj4gKwo+ICsJcmV0dXJuIDA7Cj4gK30KPiArRVhQT1JUX1NZ TUJPTChkcm1fYXRvbWljX2JyaWRnZV9jaGFpbl9jaGVjayk7Cj4gKwo+ICAvKioKPiAgICogZHJt X2F0b21pY19oZWxwZXJfYnJpZGdlX2Rlc3Ryb3lfc3RhdGUoKSAtIERlZmF1bHQgZGVzdHJveSBz dGF0ZSBoZWxwZXIKPiAgICogQGJyaWRnZTogdGhlIGJyaWRnZSB0aGlzIHN0YXRlIHJlZmVycyB0 bwo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fYnJpZGdlLmggYi9pbmNsdWRlL2RybS9k cm1fYnJpZGdlLmgKPiBpbmRleCBiMWY1NTdkOGRiYTkuLjJiZWIxZWY5YTczMyAxMDA2NDQKPiAt LS0gYS9pbmNsdWRlL2RybS9kcm1fYnJpZGdlLmgKPiArKysgYi9pbmNsdWRlL2RybS9kcm1fYnJp ZGdlLmgKPiBAQCAtMTI3LDcgKzEyNyw5IEBAIHN0cnVjdCBkcm1fYnJpZGdlX2Z1bmNzIHsKPiAg CSAqIHRoaXMgZnVuY3Rpb24gcGFzc2VzIGFsbCBvdGhlciBjYWxsYmFja3MgbXVzdCBzdWNjZWVk IGZvciB0aGlzCj4gIAkgKiBjb25maWd1cmF0aW9uLgo+ICAJICoKPiAtCSAqIFRoZSBAbW9kZV9m aXh1cCBjYWxsYmFjayBpcyBvcHRpb25hbC4KPiArCSAqIFRoZSBtb2RlX2ZpeHVwIGNhbGxiYWNr IGlzIG9wdGlvbmFsLiAmZHJtX2JyaWRnZV9mdW5jcy5tb2RlX2ZpeHVwKCkKPiArCSAqIGlzIG5v dCBjYWxsZWQgd2hlbiAmZHJtX2JyaWRnZV9mdW5jcy5hdG9taWNfY2hlY2soKSBpcyBpbXBsZW1l bnRlZCwKPiArCSAqIHNvIG9ubHkgb25lIG9mIHRoZW0gc2hvdWxkIGJlIHByb3ZpZGVkLgo+ICAJ ICoKPiAgCSAqIE5PVEU6Cj4gIAkgKgo+IEBAIC0zOTEsNiArMzkzLDI4IEBAIHN0cnVjdCBkcm1f YnJpZGdlX2Z1bmNzIHsKPiAgCXZvaWQgKCphdG9taWNfZGVzdHJveV9zdGF0ZSkoc3RydWN0IGRy bV9icmlkZ2UgKmJyaWRnZSwKPiAgCQkJCSAgICAgc3RydWN0IGRybV9icmlkZ2Vfc3RhdGUgKnN0 YXRlKTsKPiAgCj4gKwkvKioKPiArCSAqIEBhdG9taWNfY2hlY2s6Cj4gKwkgKgo+ICsJICogVGhp cyBtZXRob2QgaXMgcmVzcG9uc2libGUgZm9yIGNoZWNraW5nIGJyaWRnZSBzdGF0ZSBjb3JyZWN0 bmVzcy4KPiArCSAqIEl0IGNhbiBhbHNvIGNoZWNrIHRoZSBzdGF0ZSBvZiB0aGUgc3Vycm91bmRp bmcgY29tcG9uZW50cyBpbiBjaGFpbgo+ICsJICogdG8gbWFrZSBzdXJlIHRoZSB3aG9sZSBwaXBl bGluZSBjYW4gd29yayBwcm9wZXJseS4KCkFzIGV4cGxhaW5lZCBpbiB0aGUgcmV2aWV3IG9mIHRo ZSBSRkMsIEkgdGhpbmsgaXQncyBhIG1pc3Rha2Ugbm90IHRvCmRlZmluZSB0aGUgc2VtYW50aWNz IG9mIHRoaXMgb3BlcmF0aW9uIHByZWNpc2VseSwgYW5kIGluIHBhcnRpY3VsYXIgbm90CnRvIGRl ZmluZSBleHBsaWN0bHkgd2hhdCBwYXJhbWV0ZXJzIGJyaWRnZSBkcml2ZXJzIGFyZSBhbGxvd2Vk IHRvIG1vZGlmeQpoZXJlLiBJIGhvd2V2ZXIgZG9uJ3Qgd2FudCB0byBtYWtlIHRoaXMgYSBwcmVy ZXF1aXNpdGUgZm9yIHlvdXIgc2VyaWVzLApzbwoKUmV2aWV3ZWQtYnk6IExhdXJlbnQgUGluY2hh cnQgPGxhdXJlbnQucGluY2hhcnRAaWRlYXNvbmJvYXJkLmNvbT4KCmJ1dCBJJ20gc3VyZSB3ZSds bCByZWdyZXQgdGhpcyBsYXRlciB3aGVuIGRpZmZlcmVudCBicmlkZ2VzIHdpbGwgaGF2ZQpzbGln aHRseSBpbmNvbXBhdGlibGUgaW1wbGVtZW50YXRpb25zLgoKPiArCSAqCj4gKwkgKiAmZHJtX2Jy aWRnZV9mdW5jcy5hdG9taWNfY2hlY2soKSBob29rcyBhcmUgY2FsbGVkIGluIHJldmVyc2UKPiAr CSAqIG9yZGVyIChmcm9tIHRoZSBsYXN0IHRvIHRoZSBmaXJzdCBicmlkZ2UpLgo+ICsJICoKPiAr CSAqIFRoaXMgbWV0aG9kIGlzIG9wdGlvbmFsLiAmZHJtX2JyaWRnZV9mdW5jcy5tb2RlX2ZpeHVw KCkgaXMgbm90Cj4gKwkgKiBjYWxsZWQgd2hlbiAmZHJtX2JyaWRnZV9mdW5jcy5hdG9taWNfY2hl Y2soKSBpcyBpbXBsZW1lbnRlZCwgc28gb25seQo+ICsJICogb25lIG9mIHRoZW0gc2hvdWxkIGJl IHByb3ZpZGVkLgo+ICsJICoKPiArCSAqIFJFVFVSTlM6Cj4gKwkgKiB6ZXJvIGlmIHRoZSBjaGVj ayBwYXNzZWQsIGEgbmVnYXRpdmUgZXJyb3IgY29kZSBvdGhlcndpc2UuCj4gKwkgKi8KPiArCWlu dCAoKmF0b21pY19jaGVjaykoc3RydWN0IGRybV9icmlkZ2UgKmJyaWRnZSwKPiArCQkJICAgIHN0 cnVjdCBkcm1fYnJpZGdlX3N0YXRlICpicmlkZ2Vfc3RhdGUsCj4gKwkJCSAgICBzdHJ1Y3QgZHJt X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCj4gKwkJCSAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9z dGF0ZSAqY29ubl9zdGF0ZSk7Cj4gKwo+ICAJLyoqCj4gIAkgKiBAYXRvbWljX3Jlc2V0Ogo+ICAJ ICoKPiBAQCAtNTQyLDYgKzU2Niw5IEBAIHZvaWQgZHJtX2JyaWRnZV9jaGFpbl9tb2RlX3NldChz dHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlLAo+ICB2b2lkIGRybV9icmlkZ2VfY2hhaW5fcHJlX2Vu YWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKTsKPiAgdm9pZCBkcm1fYnJpZGdlX2NoYWlu X2VuYWJsZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKTsKPiAgCj4gK2ludCBkcm1fYXRvbWlj X2JyaWRnZV9jaGFpbl9jaGVjayhzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlLAo+ICsJCQkJICBz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCj4gKwkJCQkgIHN0cnVjdCBkcm1fY29u bmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKTsKPiAgdm9pZCBkcm1fYXRvbWljX2JyaWRnZV9jaGFp bl9kaXNhYmxlKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UsCj4gIAkJCQkgICAgIHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Cj4gIHZvaWQgZHJtX2F0b21pY19icmlkZ2VfY2hhaW5f cG9zdF9kaXNhYmxlKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UsCgotLSAKUmVnYXJkcywKCkxh dXJlbnQgUGluY2hhcnQKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVs