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 4B2F4FA372A for ; Wed, 16 Oct 2019 13:49:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13ABD2168B for ; Wed, 16 Oct 2019 13:49:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jQCbkyQv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405472AbfJPNtZ (ORCPT ); Wed, 16 Oct 2019 09:49:25 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:38616 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726689AbfJPNtZ (ORCPT ); Wed, 16 Oct 2019 09:49:25 -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 A41B39F4; Wed, 16 Oct 2019 15:49:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1571233762; bh=m7N8TtJXfjC42gO466PT2HSc5Zs3uaZEy9xf0T8y9V8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jQCbkyQviloXjO0M2K2SRrxUXfHpBT/gXpajaCfWa6vLM59P9Vtz+aSkvQtzUFnS7 6Cknzy5Izisv4nytRvGP/iP3DX3R+ig9hfI5ICmzTN8vA68PCfsBRRa77//qlUTPZC wzydgIaydspn95DMP626xOOagoiC9BFUh/wjPF24= Date: Wed, 16 Oct 2019 16:49:20 +0300 From: Laurent Pinchart To: Jacopo Mondi Cc: kieran.bingham+renesas@ideasonboard.com, geert@linux-m68k.org, horms@verge.net.au, uli+renesas@fpond.eu, airlied@linux.ie, daniel@ffwll.ch, linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v6 5/8] drm: rcar-du: crtc: Control CMM operations Message-ID: <20191016134920.GE5175@pendragon.ideasonboard.com> References: <20191016085548.105703-1-jacopo+renesas@jmondi.org> <20191016085548.105703-6-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191016085548.105703-6-jacopo+renesas@jmondi.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Hi Jacopo, Thank you for the patch. On Wed, Oct 16, 2019 at 10:55:45AM +0200, Jacopo Mondi wrote: > Implement CMM handling in the crtc begin and enable atomic callbacks, > and enable CMM unit through the Display Extensional Functions > register at group setup time. > > Reviewed-by: Kieran Bingham > Signed-off-by: Jacopo Mondi > --- > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 55 +++++++++++++++++++++++++ > drivers/gpu/drm/rcar-du/rcar_du_group.c | 10 +++++ > drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 +++ > 3 files changed, 70 insertions(+) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > index 23f1d6cc1719..d7ad491577f3 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > @@ -21,6 +21,7 @@ > #include > #include > > +#include "rcar_cmm.h" > #include "rcar_du_crtc.h" > #include "rcar_du_drv.h" > #include "rcar_du_encoder.h" > @@ -474,6 +475,45 @@ static void rcar_du_crtc_wait_page_flip(struct rcar_du_crtc *rcrtc) > rcar_du_crtc_finish_page_flip(rcrtc); > } > > +/* ----------------------------------------------------------------------------- > + * Color Management Module (CMM) > + */ > + > +static int rcar_du_cmm_check(struct drm_crtc *crtc, > + struct drm_crtc_state *state) > +{ > + struct drm_property_blob *drm_lut = state->gamma_lut; > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc); > + struct device *dev = rcrtc->dev->dev; > + > + if (!rcrtc->cmm || !drm_lut) As the gamma LUT property is only created when CMM is present, can't you drop the first part of this condition ? > + return 0; > + > + /* We only accept fully populated LUT tables. */ > + if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) { > + dev_err(dev, "invalid gamma lut size: %lu bytes\n", > + drm_lut->length); > + return -EINVAL; > + } > + > + return 0; > +} > + > +static void rcar_du_cmm_setup(struct drm_crtc *crtc) > +{ > + struct drm_property_blob *drm_lut = crtc->state->gamma_lut; > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc); > + struct rcar_cmm_config cmm_config = {}; > + > + if (!rcrtc->cmm) > + return; > + > + if (drm_lut) > + cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data; > + > + rcar_cmm_setup(rcrtc->cmm, &cmm_config); > +} > + > /* ----------------------------------------------------------------------------- > * Start/Stop and Suspend/Resume > */ > @@ -619,6 +659,9 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc) > if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE)) > rcar_du_vsp_disable(rcrtc); > > + if (rcrtc->cmm) > + rcar_cmm_disable(rcrtc->cmm); > + > /* > * Select switch sync mode. This stops display operation and configures > * the HSYNC and VSYNC signals as inputs. > @@ -642,6 +685,11 @@ static int rcar_du_crtc_atomic_check(struct drm_crtc *crtc, > { > struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(state); > struct drm_encoder *encoder; > + int ret; > + > + ret = rcar_du_cmm_check(crtc, state); > + if (ret) > + return ret; > > /* Store the routes from the CRTC output to the DU outputs. */ > rstate->outputs = 0; > @@ -667,6 +715,8 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc, > struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(crtc->state); > struct rcar_du_device *rcdu = rcrtc->dev; > > + if (rcrtc->cmm) > + rcar_cmm_enable(rcrtc->cmm); > rcar_du_crtc_get(rcrtc); > > /* > @@ -686,6 +736,7 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc, > } > > rcar_du_crtc_start(rcrtc); > + rcar_du_cmm_setup(crtc); Let's add a TODO here to figure out why we can't setup CMM before starting the CRTC. With these two small issues fixed, Reviewed-by: Laurent Pinchart > } > > static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc, > @@ -739,6 +790,10 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc, > */ > rcar_du_crtc_get(rcrtc); > > + /* If the active state changed, we let .atomic_enable handle CMM. */ > + if (crtc->state->color_mgmt_changed && !crtc->state->active_changed) > + rcar_du_cmm_setup(crtc); > + > if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE)) > rcar_du_vsp_atomic_begin(rcrtc); > } > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c > index 9eee47969e77..88a783ceb3e9 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c > @@ -135,6 +135,7 @@ static void rcar_du_group_setup_didsr(struct rcar_du_group *rgrp) > static void rcar_du_group_setup(struct rcar_du_group *rgrp) > { > struct rcar_du_device *rcdu = rgrp->dev; > + u32 defr7 = DEFR7_CODE; > > /* Enable extended features */ > rcar_du_group_write(rgrp, DEFR, DEFR_CODE | DEFR_DEFE); > @@ -147,6 +148,15 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) > > rcar_du_group_setup_pins(rgrp); > > + /* > + * TODO: Handle routing of the DU output to CMM dynamically, as we > + * should bypass CMM completely when no color management feature is > + * used. > + */ > + defr7 |= (rgrp->cmms_mask & BIT(1) ? DEFR7_CMME1 : 0) | > + (rgrp->cmms_mask & BIT(0) ? DEFR7_CMME0 : 0); > + rcar_du_group_write(rgrp, DEFR7, defr7); > + > if (rcdu->info->gen >= 2) { > rcar_du_group_setup_defr8(rgrp); > rcar_du_group_setup_didsr(rgrp); > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h > index bc87f080b170..fb9964949368 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h > +++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h > @@ -197,6 +197,11 @@ > #define DEFR6_MLOS1 (1 << 2) > #define DEFR6_DEFAULT (DEFR6_CODE | DEFR6_TCNE1) > > +#define DEFR7 0x000ec > +#define DEFR7_CODE (0x7779 << 16) > +#define DEFR7_CMME1 BIT(6) > +#define DEFR7_CMME0 BIT(4) > + > /* ----------------------------------------------------------------------------- > * R8A7790-only Control Registers > */ -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v6 5/8] drm: rcar-du: crtc: Control CMM operations Date: Wed, 16 Oct 2019 16:49:20 +0300 Message-ID: <20191016134920.GE5175@pendragon.ideasonboard.com> References: <20191016085548.105703-1-jacopo+renesas@jmondi.org> <20191016085548.105703-6-jacopo+renesas@jmondi.org> 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 8F81B6E980 for ; Wed, 16 Oct 2019 13:49:24 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20191016085548.105703-6-jacopo+renesas@jmondi.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jacopo Mondi Cc: horms@verge.net.au, airlied@linux.ie, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, kieran.bingham+renesas@ideasonboard.com, geert@linux-m68k.org, uli+renesas@fpond.eu List-Id: dri-devel@lists.freedesktop.org SGkgSmFjb3BvLAoKVGhhbmsgeW91IGZvciB0aGUgcGF0Y2guCgpPbiBXZWQsIE9jdCAxNiwgMjAx OSBhdCAxMDo1NTo0NUFNICswMjAwLCBKYWNvcG8gTW9uZGkgd3JvdGU6Cj4gSW1wbGVtZW50IENN TSBoYW5kbGluZyBpbiB0aGUgY3J0YyBiZWdpbiBhbmQgZW5hYmxlIGF0b21pYyBjYWxsYmFja3Ms Cj4gYW5kIGVuYWJsZSBDTU0gdW5pdCB0aHJvdWdoIHRoZSBEaXNwbGF5IEV4dGVuc2lvbmFsIEZ1 bmN0aW9ucwo+IHJlZ2lzdGVyIGF0IGdyb3VwIHNldHVwIHRpbWUuCj4gCj4gUmV2aWV3ZWQtYnk6 IEtpZXJhbiBCaW5naGFtIDxraWVyYW4uYmluZ2hhbStyZW5lc2FzQGlkZWFzb25ib2FyZC5jb20+ Cj4gU2lnbmVkLW9mZi1ieTogSmFjb3BvIE1vbmRpIDxqYWNvcG8rcmVuZXNhc0BqbW9uZGkub3Jn Pgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2NydGMuYyAgfCA1NSAr KysrKysrKysrKysrKysrKysrKysrKysrCj4gIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJf ZHVfZ3JvdXAuYyB8IDEwICsrKysrCj4gIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVf cmVncy5oICB8ICA1ICsrKwo+ICAzIGZpbGVzIGNoYW5nZWQsIDcwIGluc2VydGlvbnMoKykKPiAK PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMgYi9k cml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2NydGMuYwo+IGluZGV4IDIzZjFkNmNjMTcx OS4uZDdhZDQ5MTU3N2YzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3Jj YXJfZHVfY3J0Yy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRj LmMKPiBAQCAtMjEsNiArMjEsNyBAQAo+ICAjaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIu aD4KPiAgI2luY2x1ZGUgPGRybS9kcm1fdmJsYW5rLmg+Cj4gIAo+ICsjaW5jbHVkZSAicmNhcl9j bW0uaCIKPiAgI2luY2x1ZGUgInJjYXJfZHVfY3J0Yy5oIgo+ICAjaW5jbHVkZSAicmNhcl9kdV9k cnYuaCIKPiAgI2luY2x1ZGUgInJjYXJfZHVfZW5jb2Rlci5oIgo+IEBAIC00NzQsNiArNDc1LDQ1 IEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y193YWl0X3BhZ2VfZmxpcChzdHJ1Y3QgcmNhcl9k dV9jcnRjICpyY3J0YykKPiAgCXJjYXJfZHVfY3J0Y19maW5pc2hfcGFnZV9mbGlwKHJjcnRjKTsK PiAgfQo+ICAKPiArLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiArICogQ29sb3IgTWFuYWdlbWVu dCBNb2R1bGUgKENNTSkKPiArICovCj4gKwo+ICtzdGF0aWMgaW50IHJjYXJfZHVfY21tX2NoZWNr KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiArCQkJICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg KnN0YXRlKQo+ICt7Cj4gKwlzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRybV9sdXQgPSBzdGF0 ZS0+Z2FtbWFfbHV0Owo+ICsJc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMgPSB0b19yY2FyX2Ny dGMoY3J0Yyk7Cj4gKwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSByY3J0Yy0+ZGV2LT5kZXY7Cj4gKwo+ ICsJaWYgKCFyY3J0Yy0+Y21tIHx8ICFkcm1fbHV0KQoKQXMgdGhlIGdhbW1hIExVVCBwcm9wZXJ0 eSBpcyBvbmx5IGNyZWF0ZWQgd2hlbiBDTU0gaXMgcHJlc2VudCwgY2FuJ3QgeW91CmRyb3AgdGhl IGZpcnN0IHBhcnQgb2YgdGhpcyBjb25kaXRpb24gPwoKPiArCQlyZXR1cm4gMDsKPiArCj4gKwkv KiBXZSBvbmx5IGFjY2VwdCBmdWxseSBwb3B1bGF0ZWQgTFVUIHRhYmxlcy4gKi8KPiArCWlmIChk cm1fY29sb3JfbHV0X3NpemUoZHJtX2x1dCkgIT0gQ00yX0xVVF9TSVpFKSB7Cj4gKwkJZGV2X2Vy cihkZXYsICJpbnZhbGlkIGdhbW1hIGx1dCBzaXplOiAlbHUgYnl0ZXNcbiIsCj4gKwkJCWRybV9s dXQtPmxlbmd0aCk7Cj4gKwkJcmV0dXJuIC1FSU5WQUw7Cj4gKwl9Cj4gKwo+ICsJcmV0dXJuIDA7 Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lkIHJjYXJfZHVfY21tX3NldHVwKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKPiArewo+ICsJc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpkcm1fbHV0ID0gY3J0 Yy0+c3RhdGUtPmdhbW1hX2x1dDsKPiArCXN0cnVjdCByY2FyX2R1X2NydGMgKnJjcnRjID0gdG9f cmNhcl9jcnRjKGNydGMpOwo+ICsJc3RydWN0IHJjYXJfY21tX2NvbmZpZyBjbW1fY29uZmlnID0g e307Cj4gKwo+ICsJaWYgKCFyY3J0Yy0+Y21tKQo+ICsJCXJldHVybjsKPiArCj4gKwlpZiAoZHJt X2x1dCkKPiArCQljbW1fY29uZmlnLmx1dC50YWJsZSA9IChzdHJ1Y3QgZHJtX2NvbG9yX2x1dCAq KWRybV9sdXQtPmRhdGE7Cj4gKwo+ICsJcmNhcl9jbW1fc2V0dXAocmNydGMtPmNtbSwgJmNtbV9j b25maWcpOwo+ICt9Cj4gKwo+ICAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAgKiBTdGFydC9T dG9wIGFuZCBTdXNwZW5kL1Jlc3VtZQo+ICAgKi8KPiBAQCAtNjE5LDYgKzY1OSw5IEBAIHN0YXRp YyB2b2lkIHJjYXJfZHVfY3J0Y19zdG9wKHN0cnVjdCByY2FyX2R1X2NydGMgKnJjcnRjKQo+ICAJ aWYgKHJjYXJfZHVfaGFzKHJjcnRjLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9WU1AxX1NPVVJDRSkp Cj4gIAkJcmNhcl9kdV92c3BfZGlzYWJsZShyY3J0Yyk7Cj4gIAo+ICsJaWYgKHJjcnRjLT5jbW0p Cj4gKwkJcmNhcl9jbW1fZGlzYWJsZShyY3J0Yy0+Y21tKTsKPiArCj4gIAkvKgo+ICAJICogU2Vs ZWN0IHN3aXRjaCBzeW5jIG1vZGUuIFRoaXMgc3RvcHMgZGlzcGxheSBvcGVyYXRpb24gYW5kIGNv bmZpZ3VyZXMKPiAgCSAqIHRoZSBIU1lOQyBhbmQgVlNZTkMgc2lnbmFscyBhcyBpbnB1dHMuCj4g QEAgLTY0Miw2ICs2ODUsMTEgQEAgc3RhdGljIGludCByY2FyX2R1X2NydGNfYXRvbWljX2NoZWNr KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgewo+ICAJc3RydWN0IHJjYXJfZHVfY3J0Y19zdGF0 ZSAqcnN0YXRlID0gdG9fcmNhcl9jcnRjX3N0YXRlKHN0YXRlKTsKPiAgCXN0cnVjdCBkcm1fZW5j b2RlciAqZW5jb2RlcjsKPiArCWludCByZXQ7Cj4gKwo+ICsJcmV0ID0gcmNhcl9kdV9jbW1fY2hl Y2soY3J0Yywgc3RhdGUpOwo+ICsJaWYgKHJldCkKPiArCQlyZXR1cm4gcmV0Owo+ICAKPiAgCS8q IFN0b3JlIHRoZSByb3V0ZXMgZnJvbSB0aGUgQ1JUQyBvdXRwdXQgdG8gdGhlIERVIG91dHB1dHMu ICovCj4gIAlyc3RhdGUtPm91dHB1dHMgPSAwOwo+IEBAIC02NjcsNiArNzE1LDggQEAgc3RhdGlj IHZvaWQgcmNhcl9kdV9jcnRjX2F0b21pY19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ ICAJc3RydWN0IHJjYXJfZHVfY3J0Y19zdGF0ZSAqcnN0YXRlID0gdG9fcmNhcl9jcnRjX3N0YXRl KGNydGMtPnN0YXRlKTsKPiAgCXN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSA9IHJjcnRjLT5k ZXY7Cj4gIAo+ICsJaWYgKHJjcnRjLT5jbW0pCj4gKwkJcmNhcl9jbW1fZW5hYmxlKHJjcnRjLT5j bW0pOwo+ICAJcmNhcl9kdV9jcnRjX2dldChyY3J0Yyk7Cj4gIAo+ICAJLyoKPiBAQCAtNjg2LDYg KzczNiw3IEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19hdG9taWNfZW5hYmxlKHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKPiAgCX0KPiAgCj4gIAlyY2FyX2R1X2NydGNfc3RhcnQocmNydGMpOwo+ ICsJcmNhcl9kdV9jbW1fc2V0dXAoY3J0Yyk7CgpMZXQncyBhZGQgYSBUT0RPIGhlcmUgdG8gZmln dXJlIG91dCB3aHkgd2UgY2FuJ3Qgc2V0dXAgQ01NIGJlZm9yZQpzdGFydGluZyB0aGUgQ1JUQy4K CldpdGggdGhlc2UgdHdvIHNtYWxsIGlzc3VlcyBmaXhlZCwKClJldmlld2VkLWJ5OiBMYXVyZW50 IFBpbmNoYXJ0IDxsYXVyZW50LnBpbmNoYXJ0QGlkZWFzb25ib2FyZC5jb20+Cgo+ICB9Cj4gIAo+ ICBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfYXRvbWljX2Rpc2FibGUoc3RydWN0IGRybV9jcnRj ICpjcnRjLAo+IEBAIC03MzksNiArNzkwLDEwIEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19h dG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJICovCj4gIAlyY2FyX2R1X2Ny dGNfZ2V0KHJjcnRjKTsKPiAgCj4gKwkvKiBJZiB0aGUgYWN0aXZlIHN0YXRlIGNoYW5nZWQsIHdl IGxldCAuYXRvbWljX2VuYWJsZSBoYW5kbGUgQ01NLiAqLwo+ICsJaWYgKGNydGMtPnN0YXRlLT5j b2xvcl9tZ210X2NoYW5nZWQgJiYgIWNydGMtPnN0YXRlLT5hY3RpdmVfY2hhbmdlZCkKPiArCQly Y2FyX2R1X2NtbV9zZXR1cChjcnRjKTsKPiArCj4gIAlpZiAocmNhcl9kdV9oYXMocmNydGMtPmRl diwgUkNBUl9EVV9GRUFUVVJFX1ZTUDFfU09VUkNFKSkKPiAgCQlyY2FyX2R1X3ZzcF9hdG9taWNf YmVnaW4ocmNydGMpOwo+ICB9Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1 L3JjYXJfZHVfZ3JvdXAuYyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfZ3JvdXAu Ywo+IGluZGV4IDllZWU0Nzk2OWU3Ny4uODhhNzgzY2ViM2U5IDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfZ3JvdXAuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9yY2FyLWR1L3JjYXJfZHVfZ3JvdXAuYwo+IEBAIC0xMzUsNiArMTM1LDcgQEAgc3RhdGljIHZv aWQgcmNhcl9kdV9ncm91cF9zZXR1cF9kaWRzcihzdHJ1Y3QgcmNhcl9kdV9ncm91cCAqcmdycCkK PiAgc3RhdGljIHZvaWQgcmNhcl9kdV9ncm91cF9zZXR1cChzdHJ1Y3QgcmNhcl9kdV9ncm91cCAq cmdycCkKPiAgewo+ICAJc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1ID0gcmdycC0+ZGV2Owo+ ICsJdTMyIGRlZnI3ID0gREVGUjdfQ09ERTsKPiAgCj4gIAkvKiBFbmFibGUgZXh0ZW5kZWQgZmVh dHVyZXMgKi8KPiAgCXJjYXJfZHVfZ3JvdXBfd3JpdGUocmdycCwgREVGUiwgREVGUl9DT0RFIHwg REVGUl9ERUZFKTsKPiBAQCAtMTQ3LDYgKzE0OCwxNSBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2dy b3VwX3NldHVwKHN0cnVjdCByY2FyX2R1X2dyb3VwICpyZ3JwKQo+ICAKPiAgCXJjYXJfZHVfZ3Jv dXBfc2V0dXBfcGlucyhyZ3JwKTsKPiAgCj4gKwkvKgo+ICsJICogVE9ETzogSGFuZGxlIHJvdXRp bmcgb2YgdGhlIERVIG91dHB1dCB0byBDTU0gZHluYW1pY2FsbHksIGFzIHdlCj4gKwkgKiBzaG91 bGQgYnlwYXNzIENNTSBjb21wbGV0ZWx5IHdoZW4gbm8gY29sb3IgbWFuYWdlbWVudCBmZWF0dXJl IGlzCj4gKwkgKiB1c2VkLgo+ICsJICovCj4gKwlkZWZyNyB8PSAocmdycC0+Y21tc19tYXNrICYg QklUKDEpID8gREVGUjdfQ01NRTEgOiAwKSB8Cj4gKwkJIChyZ3JwLT5jbW1zX21hc2sgJiBCSVQo MCkgPyBERUZSN19DTU1FMCA6IDApOwo+ICsJcmNhcl9kdV9ncm91cF93cml0ZShyZ3JwLCBERUZS NywgZGVmcjcpOwo+ICsKPiAgCWlmIChyY2R1LT5pbmZvLT5nZW4gPj0gMikgewo+ICAJCXJjYXJf ZHVfZ3JvdXBfc2V0dXBfZGVmcjgocmdycCk7Cj4gIAkJcmNhcl9kdV9ncm91cF9zZXR1cF9kaWRz cihyZ3JwKTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9y ZWdzLmggYi9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X3JlZ3MuaAo+IGluZGV4IGJj ODdmMDgwYjE3MC4uZmI5OTY0OTQ5MzY4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9y Y2FyLWR1L3JjYXJfZHVfcmVncy5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNh cl9kdV9yZWdzLmgKPiBAQCAtMTk3LDYgKzE5NywxMSBAQAo+ICAjZGVmaW5lIERFRlI2X01MT1Mx CQkoMSA8PCAyKQo+ICAjZGVmaW5lIERFRlI2X0RFRkFVTFQJCShERUZSNl9DT0RFIHwgREVGUjZf VENORTEpCj4gIAo+ICsjZGVmaW5lIERFRlI3CQkJMHgwMDBlYwo+ICsjZGVmaW5lIERFRlI3X0NP REUJCSgweDc3NzkgPDwgMTYpCj4gKyNkZWZpbmUgREVGUjdfQ01NRTEJCUJJVCg2KQo+ICsjZGVm aW5lIERFRlI3X0NNTUUwCQlCSVQoNCkKPiArCj4gIC8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4g ICAqIFI4QTc3OTAtb25seSBDb250cm9sIFJlZ2lzdGVycwo+ICAgKi8KCi0tIApSZWdhcmRzLAoK TGF1cmVudCBQaW5jaGFydApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWw=