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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 D6403C17442 for ; Wed, 13 Nov 2019 10:04:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1A7421D7F for ; Wed, 13 Nov 2019 10:04:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727621AbfKMKEb (ORCPT ); Wed, 13 Nov 2019 05:04:31 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:39281 "EHLO relay6-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727362AbfKMKE1 (ORCPT ); Wed, 13 Nov 2019 05:04:27 -0500 X-Originating-IP: 93.34.114.233 Received: from uno.lan (93-34-114-233.ip49.fastwebnet.it [93.34.114.233]) (Authenticated sender: jacopo@jmondi.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 689C3C0010; Wed, 13 Nov 2019 10:04:22 +0000 (UTC) From: Jacopo Mondi To: laurent.pinchart@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, geert@linux-m68k.org, horms@verge.net.au, uli+renesas@fpond.eu Cc: Jacopo Mondi , airlied@linux.ie, daniel@ffwll.ch, linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 5/7] drm: rcar-du: crtc: Control CMM operations Date: Wed, 13 Nov 2019 11:05:54 +0100 Message-Id: <20191113100556.15616-6-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191113100556.15616-1-jacopo+renesas@jmondi.org> References: <20191113100556.15616-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Laurent Pinchart Reviewed-by: Kieran Bingham Signed-off-by: Jacopo Mondi --- v6 -> v7 - Drop check for CMM in rcar_du_cmm_check as if the gamma_table property is available, a CMM unit for this CRTC was registered - Add TODO note to investigate how the activation order of CMM and CRTC impact on the first displayed fram --- --- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 61 +++++++++++++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_group.c | 10 ++++ drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 ++ 3 files changed, 76 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..3f0f16946f42 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 (!drm_lut) + 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,13 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc, } rcar_du_crtc_start(rcrtc); + + /* + * TODO: The chip manual indicates that CMM tables should be written + * after the DU channel has been activated. Investigate the impact + * of this restriction on the first displayed frame. + */ + rcar_du_cmm_setup(crtc); } static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc, @@ -739,6 +796,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 */ -- 2.23.0 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 D1D64C43215 for ; Thu, 14 Nov 2019 08:08:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B79B2206EF for ; Thu, 14 Nov 2019 08:08:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B79B2206EF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jmondi.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76E8D6E21D; Thu, 14 Nov 2019 08:07:52 +0000 (UTC) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24C706ECC2 for ; Wed, 13 Nov 2019 10:04:25 +0000 (UTC) X-Originating-IP: 93.34.114.233 Received: from uno.lan (93-34-114-233.ip49.fastwebnet.it [93.34.114.233]) (Authenticated sender: jacopo@jmondi.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 689C3C0010; Wed, 13 Nov 2019 10:04:22 +0000 (UTC) From: Jacopo Mondi To: laurent.pinchart@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, geert@linux-m68k.org, horms@verge.net.au, uli+renesas@fpond.eu Subject: [PATCH v7 5/7] drm: rcar-du: crtc: Control CMM operations Date: Wed, 13 Nov 2019 11:05:54 +0100 Message-Id: <20191113100556.15616-6-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191113100556.15616-1-jacopo+renesas@jmondi.org> References: <20191113100556.15616-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 14 Nov 2019 08:07:51 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Jacopo Mondi Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191113100554.ut4PdXPg1WBrNVrWx_zZjq7YDh0X5QKdqEIGf-2fuqM@z> SW1wbGVtZW50IENNTSBoYW5kbGluZyBpbiB0aGUgY3J0YyBiZWdpbiBhbmQgZW5hYmxlIGF0b21p YyBjYWxsYmFja3MsCmFuZCBlbmFibGUgQ01NIHVuaXQgdGhyb3VnaCB0aGUgRGlzcGxheSBFeHRl bnNpb25hbCBGdW5jdGlvbnMKcmVnaXN0ZXIgYXQgZ3JvdXAgc2V0dXAgdGltZS4KClJldmlld2Vk LWJ5OiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50LnBpbmNoYXJ0QGlkZWFzb25ib2FyZC5jb20+ ClJldmlld2VkLWJ5OiBLaWVyYW4gQmluZ2hhbSA8a2llcmFuLmJpbmdoYW0rcmVuZXNhc0BpZGVh c29uYm9hcmQuY29tPgpTaWduZWQtb2ZmLWJ5OiBKYWNvcG8gTW9uZGkgPGphY29wbytyZW5lc2Fz QGptb25kaS5vcmc+CgotLS0KdjYgLT4gdjcKLSBEcm9wIGNoZWNrIGZvciBDTU0gaW4gcmNhcl9k dV9jbW1fY2hlY2sgYXMgaWYgdGhlIGdhbW1hX3RhYmxlIHByb3BlcnR5IGlzCiAgYXZhaWxhYmxl LCBhIENNTSB1bml0IGZvciB0aGlzIENSVEMgd2FzIHJlZ2lzdGVyZWQKLSBBZGQgVE9ETyBub3Rl IHRvIGludmVzdGlnYXRlIGhvdyB0aGUgYWN0aXZhdGlvbiBvcmRlciBvZiBDTU0gYW5kIENSVEMK ICBpbXBhY3Qgb24gdGhlIGZpcnN0IGRpc3BsYXllZCBmcmFtCi0tLQotLS0KIGRyaXZlcnMvZ3B1 L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5jICB8IDYxICsrKysrKysrKysrKysrKysrKysrKysr KysKIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfZ3JvdXAuYyB8IDEwICsrKysKIGRy aXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfcmVncy5oICB8ICA1ICsrCiAzIGZpbGVzIGNo YW5nZWQsIDc2IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmNh ci1kdS9yY2FyX2R1X2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0 Yy5jCmluZGV4IDIzZjFkNmNjMTcxOS4uM2YwZjE2OTQ2ZjQyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmNh ci1kdS9yY2FyX2R1X2NydGMuYwpAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1ZGUgPGRybS9kcm1f cGxhbmVfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV92YmxhbmsuaD4KIAorI2luY2x1ZGUg InJjYXJfY21tLmgiCiAjaW5jbHVkZSAicmNhcl9kdV9jcnRjLmgiCiAjaW5jbHVkZSAicmNhcl9k dV9kcnYuaCIKICNpbmNsdWRlICJyY2FyX2R1X2VuY29kZXIuaCIKQEAgLTQ3NCw2ICs0NzUsNDUg QEAgc3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX3dhaXRfcGFnZV9mbGlwKHN0cnVjdCByY2FyX2R1 X2NydGMgKnJjcnRjKQogCXJjYXJfZHVfY3J0Y19maW5pc2hfcGFnZV9mbGlwKHJjcnRjKTsKIH0K IAorLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAqIENvbG9yIE1hbmFnZW1lbnQgTW9kdWxlIChD TU0pCisgKi8KKworc3RhdGljIGludCByY2FyX2R1X2NtbV9jaGVjayhzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCisJCQkgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpCit7CisJc3RydWN0 IGRybV9wcm9wZXJ0eV9ibG9iICpkcm1fbHV0ID0gc3RhdGUtPmdhbW1hX2x1dDsKKwlzdHJ1Y3Qg cmNhcl9kdV9jcnRjICpyY3J0YyA9IHRvX3JjYXJfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgZGV2aWNl ICpkZXYgPSByY3J0Yy0+ZGV2LT5kZXY7CisKKwlpZiAoIWRybV9sdXQpCisJCXJldHVybiAwOwor CisJLyogV2Ugb25seSBhY2NlcHQgZnVsbHkgcG9wdWxhdGVkIExVVCB0YWJsZXMuICovCisJaWYg KGRybV9jb2xvcl9sdXRfc2l6ZShkcm1fbHV0KSAhPSBDTTJfTFVUX1NJWkUpIHsKKwkJZGV2X2Vy cihkZXYsICJpbnZhbGlkIGdhbW1hIGx1dCBzaXplOiAlbHUgYnl0ZXNcbiIsCisJCQlkcm1fbHV0 LT5sZW5ndGgpOworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlyZXR1cm4gMDsKK30KKworc3Rh dGljIHZvaWQgcmNhcl9kdV9jbW1fc2V0dXAoc3RydWN0IGRybV9jcnRjICpjcnRjKQoreworCXN0 cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqZHJtX2x1dCA9IGNydGMtPnN0YXRlLT5nYW1tYV9sdXQ7 CisJc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMgPSB0b19yY2FyX2NydGMoY3J0Yyk7CisJc3Ry dWN0IHJjYXJfY21tX2NvbmZpZyBjbW1fY29uZmlnID0ge307CisKKwlpZiAoIXJjcnRjLT5jbW0p CisJCXJldHVybjsKKworCWlmIChkcm1fbHV0KQorCQljbW1fY29uZmlnLmx1dC50YWJsZSA9IChz dHJ1Y3QgZHJtX2NvbG9yX2x1dCAqKWRybV9sdXQtPmRhdGE7CisKKwlyY2FyX2NtbV9zZXR1cChy Y3J0Yy0+Y21tLCAmY21tX2NvbmZpZyk7Cit9CisKIC8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAg KiBTdGFydC9TdG9wIGFuZCBTdXNwZW5kL1Jlc3VtZQogICovCkBAIC02MTksNiArNjU5LDkgQEAg c3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX3N0b3Aoc3RydWN0IHJjYXJfZHVfY3J0YyAqcmNydGMp CiAJaWYgKHJjYXJfZHVfaGFzKHJjcnRjLT5kZXYsIFJDQVJfRFVfRkVBVFVSRV9WU1AxX1NPVVJD RSkpCiAJCXJjYXJfZHVfdnNwX2Rpc2FibGUocmNydGMpOwogCisJaWYgKHJjcnRjLT5jbW0pCisJ CXJjYXJfY21tX2Rpc2FibGUocmNydGMtPmNtbSk7CisKIAkvKgogCSAqIFNlbGVjdCBzd2l0Y2gg c3luYyBtb2RlLiBUaGlzIHN0b3BzIGRpc3BsYXkgb3BlcmF0aW9uIGFuZCBjb25maWd1cmVzCiAJ ICogdGhlIEhTWU5DIGFuZCBWU1lOQyBzaWduYWxzIGFzIGlucHV0cy4KQEAgLTY0Miw2ICs2ODUs MTEgQEAgc3RhdGljIGludCByY2FyX2R1X2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKIHsKIAlzdHJ1Y3QgcmNhcl9kdV9jcnRjX3N0YXRlICpyc3RhdGUgPSB0b19yY2Fy X2NydGNfc3RhdGUoc3RhdGUpOwogCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKKwlpbnQg cmV0OworCisJcmV0ID0gcmNhcl9kdV9jbW1fY2hlY2soY3J0Yywgc3RhdGUpOworCWlmIChyZXQp CisJCXJldHVybiByZXQ7CiAKIAkvKiBTdG9yZSB0aGUgcm91dGVzIGZyb20gdGhlIENSVEMgb3V0 cHV0IHRvIHRoZSBEVSBvdXRwdXRzLiAqLwogCXJzdGF0ZS0+b3V0cHV0cyA9IDA7CkBAIC02Njcs NiArNzE1LDggQEAgc3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX2F0b21pY19lbmFibGUoc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCByY2FyX2R1X2NydGNfc3RhdGUgKnJzdGF0ZSA9IHRv X3JjYXJfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CiAJc3RydWN0IHJjYXJfZHVfZGV2aWNlICpy Y2R1ID0gcmNydGMtPmRldjsKIAorCWlmIChyY3J0Yy0+Y21tKQorCQlyY2FyX2NtbV9lbmFibGUo cmNydGMtPmNtbSk7CiAJcmNhcl9kdV9jcnRjX2dldChyY3J0Yyk7CiAKIAkvKgpAQCAtNjg2LDYg KzczNiwxMyBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfYXRvbWljX2VuYWJsZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJfQogCiAJcmNhcl9kdV9jcnRjX3N0YXJ0KHJjcnRjKTsKKworCS8q CisJICogVE9ETzogVGhlIGNoaXAgbWFudWFsIGluZGljYXRlcyB0aGF0IENNTSB0YWJsZXMgc2hv dWxkIGJlIHdyaXR0ZW4KKwkgKiBhZnRlciB0aGUgRFUgY2hhbm5lbCBoYXMgYmVlbiBhY3RpdmF0 ZWQuIEludmVzdGlnYXRlIHRoZSBpbXBhY3QKKwkgKiBvZiB0aGlzIHJlc3RyaWN0aW9uIG9uIHRo ZSBmaXJzdCBkaXNwbGF5ZWQgZnJhbWUuCisJICovCisJcmNhcl9kdV9jbW1fc2V0dXAoY3J0Yyk7 CiB9CiAKIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19hdG9taWNfZGlzYWJsZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCkBAIC03MzksNiArNzk2LDEwIEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0 Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRjLAogCSAqLwogCXJjYXJfZHVfY3J0 Y19nZXQocmNydGMpOwogCisJLyogSWYgdGhlIGFjdGl2ZSBzdGF0ZSBjaGFuZ2VkLCB3ZSBsZXQg LmF0b21pY19lbmFibGUgaGFuZGxlIENNTS4gKi8KKwlpZiAoY3J0Yy0+c3RhdGUtPmNvbG9yX21n bXRfY2hhbmdlZCAmJiAhY3J0Yy0+c3RhdGUtPmFjdGl2ZV9jaGFuZ2VkKQorCQlyY2FyX2R1X2Nt bV9zZXR1cChjcnRjKTsKKwogCWlmIChyY2FyX2R1X2hhcyhyY3J0Yy0+ZGV2LCBSQ0FSX0RVX0ZF QVRVUkVfVlNQMV9TT1VSQ0UpKQogCQlyY2FyX2R1X3ZzcF9hdG9taWNfYmVnaW4ocmNydGMpOwog fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9ncm91cC5jIGIv ZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9ncm91cC5jCmluZGV4IDllZWU0Nzk2OWU3 Ny4uODhhNzgzY2ViM2U5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2Fy X2R1X2dyb3VwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9ncm91cC5j CkBAIC0xMzUsNiArMTM1LDcgQEAgc3RhdGljIHZvaWQgcmNhcl9kdV9ncm91cF9zZXR1cF9kaWRz cihzdHJ1Y3QgcmNhcl9kdV9ncm91cCAqcmdycCkKIHN0YXRpYyB2b2lkIHJjYXJfZHVfZ3JvdXBf c2V0dXAoc3RydWN0IHJjYXJfZHVfZ3JvdXAgKnJncnApCiB7CiAJc3RydWN0IHJjYXJfZHVfZGV2 aWNlICpyY2R1ID0gcmdycC0+ZGV2OworCXUzMiBkZWZyNyA9IERFRlI3X0NPREU7CiAKIAkvKiBF bmFibGUgZXh0ZW5kZWQgZmVhdHVyZXMgKi8KIAlyY2FyX2R1X2dyb3VwX3dyaXRlKHJncnAsIERF RlIsIERFRlJfQ09ERSB8IERFRlJfREVGRSk7CkBAIC0xNDcsNiArMTQ4LDE1IEBAIHN0YXRpYyB2 b2lkIHJjYXJfZHVfZ3JvdXBfc2V0dXAoc3RydWN0IHJjYXJfZHVfZ3JvdXAgKnJncnApCiAKIAly Y2FyX2R1X2dyb3VwX3NldHVwX3BpbnMocmdycCk7CiAKKwkvKgorCSAqIFRPRE86IEhhbmRsZSBy b3V0aW5nIG9mIHRoZSBEVSBvdXRwdXQgdG8gQ01NIGR5bmFtaWNhbGx5LCBhcyB3ZQorCSAqIHNo b3VsZCBieXBhc3MgQ01NIGNvbXBsZXRlbHkgd2hlbiBubyBjb2xvciBtYW5hZ2VtZW50IGZlYXR1 cmUgaXMKKwkgKiB1c2VkLgorCSAqLworCWRlZnI3IHw9IChyZ3JwLT5jbW1zX21hc2sgJiBCSVQo MSkgPyBERUZSN19DTU1FMSA6IDApIHwKKwkJIChyZ3JwLT5jbW1zX21hc2sgJiBCSVQoMCkgPyBE RUZSN19DTU1FMCA6IDApOworCXJjYXJfZHVfZ3JvdXBfd3JpdGUocmdycCwgREVGUjcsIGRlZnI3 KTsKKwogCWlmIChyY2R1LT5pbmZvLT5nZW4gPj0gMikgewogCQlyY2FyX2R1X2dyb3VwX3NldHVw X2RlZnI4KHJncnApOwogCQlyY2FyX2R1X2dyb3VwX3NldHVwX2RpZHNyKHJncnApOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9yZWdzLmggYi9kcml2ZXJzL2dw dS9kcm0vcmNhci1kdS9yY2FyX2R1X3JlZ3MuaAppbmRleCBiYzg3ZjA4MGIxNzAuLmZiOTk2NDk0 OTM2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9yZWdzLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9yZWdzLmgKQEAgLTE5Nyw2ICsx OTcsMTEgQEAKICNkZWZpbmUgREVGUjZfTUxPUzEJCSgxIDw8IDIpCiAjZGVmaW5lIERFRlI2X0RF RkFVTFQJCShERUZSNl9DT0RFIHwgREVGUjZfVENORTEpCiAKKyNkZWZpbmUgREVGUjcJCQkweDAw MGVjCisjZGVmaW5lIERFRlI3X0NPREUJCSgweDc3NzkgPDwgMTYpCisjZGVmaW5lIERFRlI3X0NN TUUxCQlCSVQoNikKKyNkZWZpbmUgREVGUjdfQ01NRTAJCUJJVCg0KQorCiAvKiAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogICogUjhBNzc5MC1vbmx5IENvbnRyb2wgUmVnaXN0ZXJzCiAgKi8KLS0gCjIu MjMuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs