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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 B2185C10F0E for ; Mon, 15 Apr 2019 16:39:49 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7EED62087C for ; Mon, 15 Apr 2019 16:39:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="P3G2hirf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Z6aiAAs5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7EED62087C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oy3LzKp8WLPzofKKJxYGPbDhZtY0caI4QWQq9w1Y6PI=; b=P3G2hirf9OgYsf jKxOkQq2GGIP3GyXQlcV9mnBOgdAjeI8qrv0UNoSYXnsdS4KA/inCPcDTHwRGQ6POgcXTsQZqsi86 RtO7wWfTyDUnRzmDgvuZJusP2tiPH+NqxIr7HeVg+Wx43D2/J+arjYEvgBhTraOPvQx4uQ1+Ra7n+ emqcXLrhbtlmQ9qGluoK1AcAIlfwmKXojm8ybOnt+ErM0D/7hxPVLSjLO82CcMS9ai6f2xBAI7v9i P/k6YrQtR0Wcf43oZyCzHtVRybTQgXDhOzHhFCl8GFIA+QH9BMc24baefP6MPcH2ZsY0loR5TAm2l Klz6g2zy5YJUNhWZxx9Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG4dz-0008Vg-Ea; Mon, 15 Apr 2019 16:39:43 +0000 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG4du-0008Us-BI for linux-arm-kernel@lists.infradead.org; Mon, 15 Apr 2019 16:39:40 +0000 Received: by mail-ed1-x542.google.com with SMTP id j20so5076175edq.10 for ; Mon, 15 Apr 2019 09:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Sx9hyf5svdMhIcgzmHbIF2+eH6qeSey0XDYLr37KpnA=; b=Z6aiAAs5RBUyRrhre32sJHWE7sPehygk+XnOq1QLaEIIsoEYZ5rAv8VxJVDluBbuip pThjjUMxheMG5Fgx4pkgKm66c2BUul4fr/N2rgkH4DVHKuSPfWaVXAgpXKddc7JZj373 LHRJbSx45/at9SMq5ZpYMMuCXPSIHsv+FZLMo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=Sx9hyf5svdMhIcgzmHbIF2+eH6qeSey0XDYLr37KpnA=; b=GiiJn3iajvKNnjDlMIiVsLaJ5Hro35S7FZP/yPu+k6+ch13Va5EeSIGQq8Nfbqnia9 HCl7l7pZXvwgItgs/GFyoy/b+G9O6njwUtNS1CNcwtUJS3d8iukV1F0l5H56WQ5eEPfA Vyysi8r0g23Mj/4sONHdLI0iwnTnC+wTubrowAd5N87phO3CBUkvz0rHGFFZyeMo6pel rh00EmiP//yDY0jXX1f7k69fZn+kBLpcc7H4a7Ys2oTh7j/B8HT8QIp602Nw4Zv2Fd0o 8vA+/6tUA9qEcjbzRGMHY1kkfkb1Lo/CsVOZj7M6ris9i/JosRgO1YRrMICnoYifZ+9f Y2bw== X-Gm-Message-State: APjAAAVfZ9FYMzrYBs4QiMRv8KIgCprp4Dnb1MXl7yngeZ4fONnSdMin zsZACymh/IlKnKzpLnEMwGgB+Q== X-Google-Smtp-Source: APXvYqzigBdQd5P/R81yGfCcmxfSQ/UFL7LKyy1/Q7Dwd6YW+1y9I7fnpMh3TWS5TG8y1EVJ08dgpA== X-Received: by 2002:a17:907:105d:: with SMTP id oy29mr40186283ejb.258.1555346376591; Mon, 15 Apr 2019 09:39:36 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id u43sm435171edm.6.2019.04.15.09.39.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 09:39:35 -0700 (PDT) Date: Mon, 15 Apr 2019 18:39:33 +0200 From: Daniel Vetter To: Maxime Ripard Subject: Re: [PATCH v2 3/5] drm/modes: Allow to specify rotation and reflection on the commandline Message-ID: <20190415163933.GI2665@phenom.ffwll.local> References: <2afd45902d7e1e849d0aa7a0c4268c424cabe778.1554988934.git-series.maxime.ripard@bootlin.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <2afd45902d7e1e849d0aa7a0c4268c424cabe778.1554988934.git-series.maxime.ripard@bootlin.com> X-Operating-System: Linux phenom 4.19.0-1-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190415_093938_385437_A416C13A X-CRM114-Status: GOOD ( 29.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eben@raspberrypi.org, David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org, Paul Kocialkowski , Sean Paul , Thomas Petazzoni , Daniel Vetter , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Apr 11, 2019 at 03:22:41PM +0200, Maxime Ripard wrote: > Rotations and reflections setup are needed in some scenarios to initialise > properly the initial framebuffer. Some drivers already had a bunch of > quirks to deal with this, such as either a private kernel command line > parameter (omapdss) or on the device tree (various panels). > > In order to accomodate this, let's create a video mode parameter to deal > with the rotation and reflexion. > > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/drm_fb_helper.c | 4 +- > drivers/gpu/drm/drm_modes.c | 110 +++++++++++++++++++++++++++------ > include/drm/drm_connector.h | 1 +- > 3 files changed, 95 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index b3a5d79436ae..8781897559b2 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -2521,6 +2521,7 @@ static void drm_setup_crtc_rotation(struct drm_fb_helper *fb_helper, > struct drm_connector *connector) > { > struct drm_plane *plane = fb_crtc->mode_set.crtc->primary; > + struct drm_cmdline_mode *mode = &connector->cmdline_mode; > uint64_t valid_mask = 0; > int i, rotation; > > @@ -2540,6 +2541,9 @@ static void drm_setup_crtc_rotation(struct drm_fb_helper *fb_helper, > rotation = DRM_MODE_ROTATE_0; > } > > + if (mode->rotation != DRM_MODE_ROTATE_0) > + fb_crtc->rotation = mode->rotation; Hm, kinda awkward that we have to tie all this to the fbdev helpers. But that's already the case with the old stuff, so mea culpa I guess. > + > /* > * TODO: support 90 / 270 degree hardware rotation, > * depending on the hardware this may require the framebuffer > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index 9613c1a28487..ac8d70b92b62 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -1531,6 +1531,71 @@ static int drm_mode_parse_cmdline_res_mode(const char *str, unsigned int length, > return 0; > } > > +static int drm_mode_parse_cmdline_options(char *str, size_t len, > + struct drm_connector *connector, > + struct drm_cmdline_mode *mode) > +{ > + unsigned int rotation = 0; > + char *sep = str; > + > + while ((sep = strchr(sep, ','))) { > + char *delim, *option; > + > + option = sep + 1; > + delim = strchr(option, '='); > + if (!delim) { > + delim = strchr(option, ','); > + > + if (!delim) > + delim = str + len; > + } > + > + if (!strncmp(option, "rotate", delim - option)) { > + const char *value = delim + 1; > + unsigned int deg; > + > + deg = simple_strtol(value, &sep, 10); > + > + /* Make sure we have parsed something */ > + if (sep == value) > + return -EINVAL; > + > + switch (deg) { > + case 0: > + rotation |= DRM_MODE_ROTATE_0; > + break; > + > + case 90: > + rotation |= DRM_MODE_ROTATE_90; > + break; > + > + case 180: > + rotation |= DRM_MODE_ROTATE_180; > + break; > + > + case 270: > + rotation |= DRM_MODE_ROTATE_270; > + break; > + > + default: > + return -EINVAL; > + } > + } else if (!strncmp(option, "reflect_x", delim - option)) { > + rotation |= DRM_MODE_REFLECT_X; > + sep = delim; > + } else if (!strncmp(option, "reflect_y", delim - option)) { > + rotation |= DRM_MODE_REFLECT_Y; > + sep = delim; > + } else { > + return -EINVAL; > + } > + } > + > + mode->rotation = rotation; > + > + return 0; > +} > + > /** > * drm_mode_parse_command_line_for_connector - parse command line modeline for connector > * @mode_option: optional per connector mode option > @@ -1558,9 +1623,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > { > const char *name; > bool named_mode = false, parse_extras = false; > - unsigned int bpp_off = 0, refresh_off = 0; > + unsigned int bpp_off = 0, refresh_off = 0, options_off = 0; > unsigned int mode_end = 0; > char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL; > + char *options_ptr = NULL; > char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL; > int ret; > > @@ -1601,13 +1667,18 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > mode->refresh_specified = true; > } > > + /* Locate the start of named options */ > + options_ptr = strchr(name, ','); > + if (options_ptr) > + options_off = options_ptr - name; > + > /* Locate the end of the name / resolution, and parse it */ > - if (bpp_ptr && refresh_ptr) { > - mode_end = min(bpp_off, refresh_off); > - } else if (bpp_ptr) { > + if (bpp_ptr) { > mode_end = bpp_off; > } else if (refresh_ptr) { > mode_end = refresh_off; > + } else if (options_ptr) { > + mode_end = options_off; > } else { > mode_end = strlen(name); > parse_extras = true; > @@ -1649,24 +1720,23 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > else if (refresh_ptr) > extra_ptr = refresh_end_ptr; > > - if (extra_ptr) { > - if (!named_mode) { > - int len = strlen(name) - (extra_ptr - name); > + if (extra_ptr && > + extra_ptr != options_ptr) { > + int len = strlen(name) - (extra_ptr - name); > > - ret = drm_mode_parse_cmdline_extra(extra_ptr, len, > - connector, mode); > - if (ret) > - return false; > - } else { > - int remaining = strlen(name) - (extra_ptr - name); > + ret = drm_mode_parse_cmdline_extra(extra_ptr, len, > + connector, mode); > + if (ret) > + return false; > + } > > - /* > - * We still have characters to process, while > - * we shouldn't have any > - */ > - if (remaining > 0) > - return false; > - } > + if (options_ptr) { > + int len = strlen(name) - (options_ptr - name); > + > + ret = drm_mode_parse_cmdline_options(options_ptr, len, > + connector, mode); > + if (ret) > + return false; > } > > return true; > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 06aa3b9cb920..dfe7f2304b35 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -907,6 +907,7 @@ struct drm_cmdline_mode { > bool interlace; > bool cvt; > bool margins; > + unsigned int rotation; > enum drm_connector_force force; Kerneldoc for this would be neat. -Daniel > }; > > -- > git-series 0.9.1 > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 3/5] drm/modes: Allow to specify rotation and reflection on the commandline Date: Mon, 15 Apr 2019 18:39:33 +0200 Message-ID: <20190415163933.GI2665@phenom.ffwll.local> References: <2afd45902d7e1e849d0aa7a0c4268c424cabe778.1554988934.git-series.maxime.ripard@bootlin.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id E704589890 for ; Mon, 15 Apr 2019 16:39:37 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id d1so15259545edd.13 for ; Mon, 15 Apr 2019 09:39:37 -0700 (PDT) Content-Disposition: inline In-Reply-To: <2afd45902d7e1e849d0aa7a0c4268c424cabe778.1554988934.git-series.maxime.ripard@bootlin.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maxime Ripard Cc: eben@raspberrypi.org, David Airlie , dri-devel@lists.freedesktop.org, Paul Kocialkowski , Sean Paul , Thomas Petazzoni , Daniel Vetter , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBBcHIgMTEsIDIwMTkgYXQgMDM6MjI6NDFQTSArMDIwMCwgTWF4aW1lIFJpcGFyZCB3 cm90ZToKPiBSb3RhdGlvbnMgYW5kIHJlZmxlY3Rpb25zIHNldHVwIGFyZSBuZWVkZWQgaW4gc29t ZSBzY2VuYXJpb3MgdG8gaW5pdGlhbGlzZQo+IHByb3Blcmx5IHRoZSBpbml0aWFsIGZyYW1lYnVm ZmVyLiBTb21lIGRyaXZlcnMgYWxyZWFkeSBoYWQgYSBidW5jaCBvZgo+IHF1aXJrcyB0byBkZWFs IHdpdGggdGhpcywgc3VjaCBhcyBlaXRoZXIgYSBwcml2YXRlIGtlcm5lbCBjb21tYW5kIGxpbmUK PiBwYXJhbWV0ZXIgKG9tYXBkc3MpIG9yIG9uIHRoZSBkZXZpY2UgdHJlZSAodmFyaW91cyBwYW5l bHMpLgo+IAo+IEluIG9yZGVyIHRvIGFjY29tb2RhdGUgdGhpcywgbGV0J3MgY3JlYXRlIGEgdmlk ZW8gbW9kZSBwYXJhbWV0ZXIgdG8gZGVhbAo+IHdpdGggdGhlIHJvdGF0aW9uIGFuZCByZWZsZXhp b24uCj4gCj4gU2lnbmVkLW9mZi1ieTogTWF4aW1lIFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBib290 bGluLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYyB8ICAgNCAr LQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMgICAgIHwgMTEwICsrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLQo+ICBpbmNsdWRlL2RybS9kcm1fY29ubmVjdG9yLmggICAgIHwg ICAxICstCj4gIDMgZmlsZXMgY2hhbmdlZCwgOTUgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25z KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCj4gaW5kZXggYjNhNWQ3OTQzNmFlLi44Nzgx ODk3NTU5YjIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKPiBAQCAtMjUyMSw2ICsyNTIx LDcgQEAgc3RhdGljIHZvaWQgZHJtX3NldHVwX2NydGNfcm90YXRpb24oc3RydWN0IGRybV9mYl9o ZWxwZXIgKmZiX2hlbHBlciwKPiAgCQkJCSAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IGZiX2NydGMtPm1vZGVfc2V0 LmNydGMtPnByaW1hcnk7Cj4gKwlzdHJ1Y3QgZHJtX2NtZGxpbmVfbW9kZSAqbW9kZSA9ICZjb25u ZWN0b3ItPmNtZGxpbmVfbW9kZTsKPiAgCXVpbnQ2NF90IHZhbGlkX21hc2sgPSAwOwo+ICAJaW50 IGksIHJvdGF0aW9uOwo+ICAKPiBAQCAtMjU0MCw2ICsyNTQxLDkgQEAgc3RhdGljIHZvaWQgZHJt X3NldHVwX2NydGNfcm90YXRpb24oc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciwKPiAg CQlyb3RhdGlvbiA9IERSTV9NT0RFX1JPVEFURV8wOwo+ICAJfQo+ICAKPiArCWlmIChtb2RlLT5y b3RhdGlvbiAhPSBEUk1fTU9ERV9ST1RBVEVfMCkKPiArCQlmYl9jcnRjLT5yb3RhdGlvbiA9IG1v ZGUtPnJvdGF0aW9uOwoKSG0sIGtpbmRhIGF3a3dhcmQgdGhhdCB3ZSBoYXZlIHRvIHRpZSBhbGwg dGhpcyB0byB0aGUgZmJkZXYgaGVscGVycy4gQnV0CnRoYXQncyBhbHJlYWR5IHRoZSBjYXNlIHdp dGggdGhlIG9sZCBzdHVmZiwgc28gbWVhIGN1bHBhIEkgZ3Vlc3MuCgo+ICsKPiAgCS8qCj4gIAkg KiBUT0RPOiBzdXBwb3J0IDkwIC8gMjcwIGRlZ3JlZSBoYXJkd2FyZSByb3RhdGlvbiwKPiAgCSAq IGRlcGVuZGluZyBvbiB0aGUgaGFyZHdhcmUgdGhpcyBtYXkgcmVxdWlyZSB0aGUgZnJhbWVidWZm ZXIKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jIGIvZHJpdmVycy9n cHUvZHJtL2RybV9tb2Rlcy5jCj4gaW5kZXggOTYxM2MxYTI4NDg3Li5hYzhkNzBiOTJiNjIgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2RybV9tb2Rlcy5jCj4gQEAgLTE1MzEsNiArMTUzMSw3MSBAQCBzdGF0aWMgaW50IGRy bV9tb2RlX3BhcnNlX2NtZGxpbmVfcmVzX21vZGUoY29uc3QgY2hhciAqc3RyLCB1bnNpZ25lZCBp bnQgbGVuZ3RoLAo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gK3N0YXRpYyBpbnQgZHJtX21vZGVf cGFyc2VfY21kbGluZV9vcHRpb25zKGNoYXIgKnN0ciwgc2l6ZV90IGxlbiwKPiArCQkJCQkgIHN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCj4gKwkJCQkJICBzdHJ1Y3QgZHJtX2NtZGxp bmVfbW9kZSAqbW9kZSkKPiArewo+ICsJdW5zaWduZWQgaW50IHJvdGF0aW9uID0gMDsKPiArCWNo YXIgKnNlcCA9IHN0cjsKPiArCj4gKwl3aGlsZSAoKHNlcCA9IHN0cmNocihzZXAsICcsJykpKSB7 Cj4gKwkJY2hhciAqZGVsaW0sICpvcHRpb247Cj4gKwo+ICsJCW9wdGlvbiA9IHNlcCArIDE7Cj4g KwkJZGVsaW0gPSBzdHJjaHIob3B0aW9uLCAnPScpOwo+ICsJCWlmICghZGVsaW0pIHsKPiArCQkJ ZGVsaW0gPSBzdHJjaHIob3B0aW9uLCAnLCcpOwo+ICsKPiArCQkJaWYgKCFkZWxpbSkKPiArCQkJ CWRlbGltID0gc3RyICsgbGVuOwo+ICsJCX0KPiArCj4gKwkJaWYgKCFzdHJuY21wKG9wdGlvbiwg InJvdGF0ZSIsIGRlbGltIC0gb3B0aW9uKSkgewo+ICsJCQljb25zdCBjaGFyICp2YWx1ZSA9IGRl bGltICsgMTsKPiArCQkJdW5zaWduZWQgaW50IGRlZzsKPiArCj4gKwkJCWRlZyA9IHNpbXBsZV9z dHJ0b2wodmFsdWUsICZzZXAsIDEwKTsKPiArCj4gKwkJCS8qIE1ha2Ugc3VyZSB3ZSBoYXZlIHBh cnNlZCBzb21ldGhpbmcgKi8KPiArCQkJaWYgKHNlcCA9PSB2YWx1ZSkKPiArCQkJCXJldHVybiAt RUlOVkFMOwo+ICsKPiArCQkJc3dpdGNoIChkZWcpIHsKPiArCQkJY2FzZSAwOgo+ICsJCQkJcm90 YXRpb24gfD0gRFJNX01PREVfUk9UQVRFXzA7Cj4gKwkJCQlicmVhazsKPiArCj4gKwkJCWNhc2Ug OTA6Cj4gKwkJCQlyb3RhdGlvbiB8PSBEUk1fTU9ERV9ST1RBVEVfOTA7Cj4gKwkJCQlicmVhazsK PiArCj4gKwkJCWNhc2UgMTgwOgo+ICsJCQkJcm90YXRpb24gfD0gRFJNX01PREVfUk9UQVRFXzE4 MDsKPiArCQkJCWJyZWFrOwo+ICsKPiArCQkJY2FzZSAyNzA6Cj4gKwkJCQlyb3RhdGlvbiB8PSBE Uk1fTU9ERV9ST1RBVEVfMjcwOwo+ICsJCQkJYnJlYWs7Cj4gKwo+ICsJCQlkZWZhdWx0Ogo+ICsJ CQkJcmV0dXJuIC1FSU5WQUw7Cj4gKwkJCX0KPiArCQl9IGVsc2UgaWYgKCFzdHJuY21wKG9wdGlv biwgInJlZmxlY3RfeCIsIGRlbGltIC0gb3B0aW9uKSkgewo+ICsJCQlyb3RhdGlvbiB8PSBEUk1f TU9ERV9SRUZMRUNUX1g7Cj4gKwkJCXNlcCA9IGRlbGltOwo+ICsJCX0gZWxzZSBpZiAoIXN0cm5j bXAob3B0aW9uLCAicmVmbGVjdF95IiwgZGVsaW0gLSBvcHRpb24pKSB7Cj4gKwkJCXJvdGF0aW9u IHw9IERSTV9NT0RFX1JFRkxFQ1RfWTsKPiArCQkJc2VwID0gZGVsaW07Cj4gKwkJfSBlbHNlIHsK PiArCQkJcmV0dXJuIC1FSU5WQUw7Cj4gKwkJfQo+ICsJfQo+ICsKPiArCW1vZGUtPnJvdGF0aW9u ID0gcm90YXRpb247Cj4gKwo+ICsJcmV0dXJuIDA7Cj4gK30KPiArCj4gIC8qKgo+ICAgKiBkcm1f bW9kZV9wYXJzZV9jb21tYW5kX2xpbmVfZm9yX2Nvbm5lY3RvciAtIHBhcnNlIGNvbW1hbmQgbGlu ZSBtb2RlbGluZSBmb3IgY29ubmVjdG9yCj4gICAqIEBtb2RlX29wdGlvbjogb3B0aW9uYWwgcGVy IGNvbm5lY3RvciBtb2RlIG9wdGlvbgo+IEBAIC0xNTU4LDkgKzE2MjMsMTAgQEAgYm9vbCBkcm1f bW9kZV9wYXJzZV9jb21tYW5kX2xpbmVfZm9yX2Nvbm5lY3Rvcihjb25zdCBjaGFyICptb2RlX29w dGlvbiwKPiAgewo+ICAJY29uc3QgY2hhciAqbmFtZTsKPiAgCWJvb2wgbmFtZWRfbW9kZSA9IGZh bHNlLCBwYXJzZV9leHRyYXMgPSBmYWxzZTsKPiAtCXVuc2lnbmVkIGludCBicHBfb2ZmID0gMCwg cmVmcmVzaF9vZmYgPSAwOwo+ICsJdW5zaWduZWQgaW50IGJwcF9vZmYgPSAwLCByZWZyZXNoX29m ZiA9IDAsIG9wdGlvbnNfb2ZmID0gMDsKPiAgCXVuc2lnbmVkIGludCBtb2RlX2VuZCA9IDA7Cj4g IAljaGFyICpicHBfcHRyID0gTlVMTCwgKnJlZnJlc2hfcHRyID0gTlVMTCwgKmV4dHJhX3B0ciA9 IE5VTEw7Cj4gKwljaGFyICpvcHRpb25zX3B0ciA9IE5VTEw7Cj4gIAljaGFyICpicHBfZW5kX3B0 ciA9IE5VTEwsICpyZWZyZXNoX2VuZF9wdHIgPSBOVUxMOwo+ICAJaW50IHJldDsKPiAgCj4gQEAg LTE2MDEsMTMgKzE2NjcsMTggQEAgYm9vbCBkcm1fbW9kZV9wYXJzZV9jb21tYW5kX2xpbmVfZm9y X2Nvbm5lY3Rvcihjb25zdCBjaGFyICptb2RlX29wdGlvbiwKPiAgCQltb2RlLT5yZWZyZXNoX3Nw ZWNpZmllZCA9IHRydWU7Cj4gIAl9Cj4gIAo+ICsJLyogTG9jYXRlIHRoZSBzdGFydCBvZiBuYW1l ZCBvcHRpb25zICovCj4gKwlvcHRpb25zX3B0ciA9IHN0cmNocihuYW1lLCAnLCcpOwo+ICsJaWYg KG9wdGlvbnNfcHRyKQo+ICsJCW9wdGlvbnNfb2ZmID0gb3B0aW9uc19wdHIgLSBuYW1lOwo+ICsK PiAgCS8qIExvY2F0ZSB0aGUgZW5kIG9mIHRoZSBuYW1lIC8gcmVzb2x1dGlvbiwgYW5kIHBhcnNl IGl0ICovCj4gLQlpZiAoYnBwX3B0ciAmJiByZWZyZXNoX3B0cikgewo+IC0JCW1vZGVfZW5kID0g bWluKGJwcF9vZmYsIHJlZnJlc2hfb2ZmKTsKPiAtCX0gZWxzZSBpZiAoYnBwX3B0cikgewo+ICsJ aWYgKGJwcF9wdHIpIHsKPiAgCQltb2RlX2VuZCA9IGJwcF9vZmY7Cj4gIAl9IGVsc2UgaWYgKHJl ZnJlc2hfcHRyKSB7Cj4gIAkJbW9kZV9lbmQgPSByZWZyZXNoX29mZjsKPiArCX0gZWxzZSBpZiAo b3B0aW9uc19wdHIpIHsKPiArCQltb2RlX2VuZCA9IG9wdGlvbnNfb2ZmOwo+ICAJfSBlbHNlIHsK PiAgCQltb2RlX2VuZCA9IHN0cmxlbihuYW1lKTsKPiAgCQlwYXJzZV9leHRyYXMgPSB0cnVlOwo+ IEBAIC0xNjQ5LDI0ICsxNzIwLDIzIEBAIGJvb2wgZHJtX21vZGVfcGFyc2VfY29tbWFuZF9saW5l X2Zvcl9jb25uZWN0b3IoY29uc3QgY2hhciAqbW9kZV9vcHRpb24sCj4gIAllbHNlIGlmIChyZWZy ZXNoX3B0cikKPiAgCQlleHRyYV9wdHIgPSByZWZyZXNoX2VuZF9wdHI7Cj4gIAo+IC0JaWYgKGV4 dHJhX3B0cikgewo+IC0JCWlmICghbmFtZWRfbW9kZSkgewo+IC0JCQlpbnQgbGVuID0gc3RybGVu KG5hbWUpIC0gKGV4dHJhX3B0ciAtIG5hbWUpOwo+ICsJaWYgKGV4dHJhX3B0ciAmJgo+ICsJICAg IGV4dHJhX3B0ciAhPSBvcHRpb25zX3B0cikgewo+ICsJCWludCBsZW4gPSBzdHJsZW4obmFtZSkg LSAoZXh0cmFfcHRyIC0gbmFtZSk7Cj4gIAo+IC0JCQlyZXQgPSBkcm1fbW9kZV9wYXJzZV9jbWRs aW5lX2V4dHJhKGV4dHJhX3B0ciwgbGVuLAo+IC0JCQkJCQkJICAgY29ubmVjdG9yLCBtb2RlKTsK PiAtCQkJaWYgKHJldCkKPiAtCQkJCXJldHVybiBmYWxzZTsKPiAtCQl9IGVsc2Ugewo+IC0JCQlp bnQgcmVtYWluaW5nID0gc3RybGVuKG5hbWUpIC0gKGV4dHJhX3B0ciAtIG5hbWUpOwo+ICsJCXJl dCA9IGRybV9tb2RlX3BhcnNlX2NtZGxpbmVfZXh0cmEoZXh0cmFfcHRyLCBsZW4sCj4gKwkJCQkJ CSAgIGNvbm5lY3RvciwgbW9kZSk7Cj4gKwkJaWYgKHJldCkKPiArCQkJcmV0dXJuIGZhbHNlOwo+ ICsJfQo+ICAKPiAtCQkJLyoKPiAtCQkJICogV2Ugc3RpbGwgaGF2ZSBjaGFyYWN0ZXJzIHRvIHBy b2Nlc3MsIHdoaWxlCj4gLQkJCSAqIHdlIHNob3VsZG4ndCBoYXZlIGFueQo+IC0JCQkgKi8KPiAt CQkJaWYgKHJlbWFpbmluZyA+IDApCj4gLQkJCQlyZXR1cm4gZmFsc2U7Cj4gLQkJfQo+ICsJaWYg KG9wdGlvbnNfcHRyKSB7Cj4gKwkJaW50IGxlbiA9IHN0cmxlbihuYW1lKSAtIChvcHRpb25zX3B0 ciAtIG5hbWUpOwo+ICsKPiArCQlyZXQgPSBkcm1fbW9kZV9wYXJzZV9jbWRsaW5lX29wdGlvbnMo b3B0aW9uc19wdHIsIGxlbiwKPiArCQkJCQkJICAgICBjb25uZWN0b3IsIG1vZGUpOwo+ICsJCWlm IChyZXQpCj4gKwkJCXJldHVybiBmYWxzZTsKPiAgCX0KPiAgCj4gIAlyZXR1cm4gdHJ1ZTsKPiBk aWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oIGIvaW5jbHVkZS9kcm0vZHJt X2Nvbm5lY3Rvci5oCj4gaW5kZXggMDZhYTNiOWNiOTIwLi5kZmU3ZjIzMDRiMzUgMTAwNjQ0Cj4g LS0tIGEvaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oCj4gKysrIGIvaW5jbHVkZS9kcm0vZHJt X2Nvbm5lY3Rvci5oCj4gQEAgLTkwNyw2ICs5MDcsNyBAQCBzdHJ1Y3QgZHJtX2NtZGxpbmVfbW9k ZSB7Cj4gIAlib29sIGludGVybGFjZTsKPiAgCWJvb2wgY3Z0Owo+ICAJYm9vbCBtYXJnaW5zOwo+ ICsJdW5zaWduZWQgaW50IHJvdGF0aW9uOwo+ICAJZW51bSBkcm1fY29ubmVjdG9yX2ZvcmNlIGZv cmNlOwoKS2VybmVsZG9jIGZvciB0aGlzIHdvdWxkIGJlIG5lYXQuCi1EYW5pZWwKCj4gIH07Cj4g IAo+IC0tIAo+IGdpdC1zZXJpZXMgMC45LjEKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2lu ZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=