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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 4AF4DC54E8C for ; Sun, 10 May 2020 16:55:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B5A52495C for ; Sun, 10 May 2020 16:55:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fyrpJtPg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729229AbgEJQzz (ORCPT ); Sun, 10 May 2020 12:55:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729138AbgEJQzx (ORCPT ); Sun, 10 May 2020 12:55:53 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05EB1C061A0C for ; Sun, 10 May 2020 09:55:52 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id g13so7934749wrb.8 for ; Sun, 10 May 2020 09:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MuMQv3TQjzWt0xJoCSiQfhuulnnGfideK7v9jTFs0HY=; b=fyrpJtPgFlcuvkPOW5j1/lp3g5iSo+9OUeH0bx+WR5wQrt065deyEwRAZAIiP4QDHh l05jlqveetvPYT3qYFdt1AFfz1c0c248txugCWMoglvRmKOoOwxa1kVUVBq2/kbLrgd7 LqAsaszQO0AUmkCBS05LFzSY7OgZY4kwklq4SlR9FzZiIu32Pc6DKSzq2M+oJa4cFclQ Yo02ZOomugp+YuW/rL+dKJR2/f7/6hoSJnH24YIqrt/xv1d0/7JJjQredljULXeczIVn DbSfHXahnDECsQERLAMw73eQuNo1dPEB11NFgjqm9V+Azayp5UEyBPD8fI03fqhpwXqS 9suA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MuMQv3TQjzWt0xJoCSiQfhuulnnGfideK7v9jTFs0HY=; b=fEy2miDQ+ThsNDhTXAjhkXPiLUFHrwoP0roatXdiKvwDsVFKJS+xbuXjeWKM0R8d5v 629/0Gi9VqA9DG0e7EoWxnkFoMOooAw/2sg69lsD1SRfrdFpjjijUQM4UKvvpVggaVhp iK+1RkiwxY1j8gsNpKgx7V3hCc1RNHaPteOKmNUdflC/82sW0jxcLsjVu8Yvg6y3aKWl Xilqq/5Cp0VuzgqSm6XYB5ZPozJAA+6f10ssC8gzX9Iv+ny43zbeSv6vEit0L4BeBqnS 4jxcCyuLfivoYBlK10MkBzi56Lo6h97CeHTvEIkA7F0rl8MIAB/Cj6RyPorhGzu+Xzkt SI4Q== X-Gm-Message-State: AGi0PuboEmFppjOFsy6xeL+eKqTvjCzfcW0liONkgko0mCxM1bMgqGTU YM2vmYgS/3lyhHDjEuWlx04= X-Google-Smtp-Source: APiQypJodrcduJhPQ3zVroQSWDBWm48ib5AjP1g8GZC5uLIlDPvSPS+1i5tb3xOxIgjp+i1tXZwetQ== X-Received: by 2002:adf:8403:: with SMTP id 3mr13603230wrf.186.1589129750653; Sun, 10 May 2020 09:55:50 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0:1cc8:b1f1:a2b8:a1ee]) by smtp.gmail.com with ESMTPSA id g15sm13637670wrp.96.2020.05.10.09.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 09:55:49 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Rob Herring , Tomeu Vizoso , Steven Price , Alyssa Rosenzweig , Viresh Kumar , Nishanth Menon , Stephen Boyd , Maxime Ripard , Chen-Yu Tsai Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH 08/15] drm/panfrost: move devfreq_init()/fini() in device Date: Sun, 10 May 2020 18:55:31 +0200 Message-Id: <20200510165538.19720-9-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200510165538.19720-1-peron.clem@gmail.com> References: <20200510165538.19720-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Later we will introduce devfreq probing regulator if they are present. As regulator should be probe only one time we need to get this logic in the device_init(). panfrost_device is already taking care of devfreq_resume() and devfreq_suspend(), so it's not totally illogic to move the devfreq_init() and devfreq_fini() here. Signed-off-by: Clément Péron --- drivers/gpu/drm/panfrost/panfrost_device.c | 37 ++++++++++++++-------- drivers/gpu/drm/panfrost/panfrost_drv.c | 15 ++------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 8136babd3ba9..f480127205d6 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -212,59 +212,67 @@ int panfrost_device_init(struct panfrost_device *pfdev) return err; } + err = panfrost_devfreq_init(pfdev); + if (err) { + dev_err(pfdev->dev, "devfreq init failed %d\n", err); + goto err_out0; + } + err = panfrost_regulator_init(pfdev); if (err) { dev_err(pfdev->dev, "regulator init failed %d\n", err); - goto err_out0; + goto err_out1; } err = panfrost_reset_init(pfdev); if (err) { dev_err(pfdev->dev, "reset init failed %d\n", err); - goto err_out1; + goto err_out2; } err = panfrost_pm_domain_init(pfdev); if (err) - goto err_out2; + goto err_out3; res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); if (IS_ERR(pfdev->iomem)) { dev_err(pfdev->dev, "failed to ioremap iomem\n"); err = PTR_ERR(pfdev->iomem); - goto err_out3; + goto err_out4; } err = panfrost_gpu_init(pfdev); if (err) - goto err_out3; + goto err_out4; err = panfrost_mmu_init(pfdev); if (err) - goto err_out4; + goto err_out5; err = panfrost_job_init(pfdev); if (err) - goto err_out5; + goto err_out6; err = panfrost_perfcnt_init(pfdev); if (err) - goto err_out6; + goto err_out7; return 0; -err_out6: +err_out7: panfrost_job_fini(pfdev); -err_out5: +err_out6: panfrost_mmu_fini(pfdev); -err_out4: +err_out5: panfrost_gpu_fini(pfdev); -err_out3: +err_out4: panfrost_pm_domain_fini(pfdev); -err_out2: +err_out3: panfrost_reset_fini(pfdev); -err_out1: +err_out2: panfrost_regulator_fini(pfdev); +err_out1: + panfrost_devfreq_fini(pfdev); err_out0: panfrost_clk_fini(pfdev); return err; @@ -278,6 +286,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) panfrost_gpu_fini(pfdev); panfrost_pm_domain_fini(pfdev); panfrost_reset_fini(pfdev); + panfrost_devfreq_fini(pfdev); panfrost_regulator_fini(pfdev); panfrost_clk_fini(pfdev); } diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 882fecc33fdb..4dda68689015 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -14,7 +14,6 @@ #include #include "panfrost_device.h" -#include "panfrost_devfreq.h" #include "panfrost_gem.h" #include "panfrost_mmu.h" #include "panfrost_job.h" @@ -606,13 +605,6 @@ static int panfrost_probe(struct platform_device *pdev) goto err_out0; } - err = panfrost_devfreq_init(pfdev); - if (err) { - if (err != -EPROBE_DEFER) - dev_err(&pdev->dev, "Fatal error during devfreq init\n"); - goto err_out1; - } - pm_runtime_set_active(pfdev->dev); pm_runtime_mark_last_busy(pfdev->dev); pm_runtime_enable(pfdev->dev); @@ -625,16 +617,14 @@ static int panfrost_probe(struct platform_device *pdev) */ err = drm_dev_register(ddev, 0); if (err < 0) - goto err_out2; + goto err_out1; panfrost_gem_shrinker_init(ddev); return 0; -err_out2: - pm_runtime_disable(pfdev->dev); - panfrost_devfreq_fini(pfdev); err_out1: + pm_runtime_disable(pfdev->dev); panfrost_device_fini(pfdev); err_out0: drm_dev_put(ddev); @@ -650,7 +640,6 @@ static int panfrost_remove(struct platform_device *pdev) panfrost_gem_shrinker_cleanup(ddev); pm_runtime_get_sync(pfdev->dev); - panfrost_devfreq_fini(pfdev); panfrost_device_fini(pfdev); pm_runtime_put_sync_suspend(pfdev->dev); pm_runtime_disable(pfdev->dev); -- 2.20.1 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.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 93E35C47255 for ; Mon, 11 May 2020 07:17:58 +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 6AA312080C for ; Mon, 11 May 2020 07:17:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fyrpJtPg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AA312080C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 810AC6E21E; Mon, 11 May 2020 07:17:30 +0000 (UTC) Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1420889FC9 for ; Sun, 10 May 2020 16:55:52 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id s8so7936723wrt.9 for ; Sun, 10 May 2020 09:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MuMQv3TQjzWt0xJoCSiQfhuulnnGfideK7v9jTFs0HY=; b=fyrpJtPgFlcuvkPOW5j1/lp3g5iSo+9OUeH0bx+WR5wQrt065deyEwRAZAIiP4QDHh l05jlqveetvPYT3qYFdt1AFfz1c0c248txugCWMoglvRmKOoOwxa1kVUVBq2/kbLrgd7 LqAsaszQO0AUmkCBS05LFzSY7OgZY4kwklq4SlR9FzZiIu32Pc6DKSzq2M+oJa4cFclQ Yo02ZOomugp+YuW/rL+dKJR2/f7/6hoSJnH24YIqrt/xv1d0/7JJjQredljULXeczIVn DbSfHXahnDECsQERLAMw73eQuNo1dPEB11NFgjqm9V+Azayp5UEyBPD8fI03fqhpwXqS 9suA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MuMQv3TQjzWt0xJoCSiQfhuulnnGfideK7v9jTFs0HY=; b=BDuwiKnhQnqa4jq/OL1lsuoPEJZx1pMv8JzBp5hYYG3ZilL9zzqUUb+0w1rPpK6mDI IGTaY19nICi7XuLanFi2MXsp+X39CWFcMvy40ApenoZvR2ViV8EVEYY7lMEd8g9btxby Vsyl3aExvo/JEBUA/TZmJTdQLSjzJJ20MTWnHYpcsynkhP6quxT2UZrUeKRt/2npL9Ey YRo+LUmLQ3zYw+pMUs9zw6V4HmZUy++oftGUVaImX2wp9AtSj3magZbqUwnYsmIF3+Hw BHXguuCM/i98YRRLI7ODO786m3PgleaSxTbBVYy34x7f4nuAw8I3GABXUWUZjvdEyoim K1GA== X-Gm-Message-State: AGi0PuZDiybfyQ4G1QdzXwyyBtN7c9+GBKzAkAGdc1PtFicEWBi3wQpF kduwzeVE7pRHC37UhdoMmHk= X-Google-Smtp-Source: APiQypJodrcduJhPQ3zVroQSWDBWm48ib5AjP1g8GZC5uLIlDPvSPS+1i5tb3xOxIgjp+i1tXZwetQ== X-Received: by 2002:adf:8403:: with SMTP id 3mr13603230wrf.186.1589129750653; Sun, 10 May 2020 09:55:50 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0:1cc8:b1f1:a2b8:a1ee]) by smtp.gmail.com with ESMTPSA id g15sm13637670wrp.96.2020.05.10.09.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 09:55:49 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Rob Herring , Tomeu Vizoso , Steven Price , Alyssa Rosenzweig , Viresh Kumar , Nishanth Menon , Stephen Boyd , Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 08/15] drm/panfrost: move devfreq_init()/fini() in device Date: Sun, 10 May 2020 18:55:31 +0200 Message-Id: <20200510165538.19720-9-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200510165538.19720-1-peron.clem@gmail.com> References: <20200510165538.19720-1-peron.clem@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 11 May 2020 07:17:28 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" TGF0ZXIgd2Ugd2lsbCBpbnRyb2R1Y2UgZGV2ZnJlcSBwcm9iaW5nIHJlZ3VsYXRvciBpZiB0aGV5 CmFyZSBwcmVzZW50LiBBcyByZWd1bGF0b3Igc2hvdWxkIGJlIHByb2JlIG9ubHkgb25lIHRpbWUg d2UKbmVlZCB0byBnZXQgdGhpcyBsb2dpYyBpbiB0aGUgZGV2aWNlX2luaXQoKS4KCnBhbmZyb3N0 X2RldmljZSBpcyBhbHJlYWR5IHRha2luZyBjYXJlIG9mIGRldmZyZXFfcmVzdW1lKCkKYW5kIGRl dmZyZXFfc3VzcGVuZCgpLCBzbyBpdCdzIG5vdCB0b3RhbGx5IGlsbG9naWMgdG8gbW92ZQp0aGUg ZGV2ZnJlcV9pbml0KCkgYW5kIGRldmZyZXFfZmluaSgpIGhlcmUuCgpTaWduZWQtb2ZmLWJ5OiBD bMOpbWVudCBQw6lyb24gPHBlcm9uLmNsZW1AZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9wYW5mcm9zdC9wYW5mcm9zdF9kZXZpY2UuYyB8IDM3ICsrKysrKysrKysrKysrLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9kcnYuYyAgICB8IDE1ICsrLS0tLS0t LQogMiBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZGV2aWNlLmMgYi9k cml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZGV2aWNlLmMKaW5kZXggODEzNmJhYmQz YmE5Li5mNDgwMTI3MjA1ZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9w YW5mcm9zdF9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3Rf ZGV2aWNlLmMKQEAgLTIxMiw1OSArMjEyLDY3IEBAIGludCBwYW5mcm9zdF9kZXZpY2VfaW5pdChz dHJ1Y3QgcGFuZnJvc3RfZGV2aWNlICpwZmRldikKIAkJcmV0dXJuIGVycjsKIAl9CiAKKwllcnIg PSBwYW5mcm9zdF9kZXZmcmVxX2luaXQocGZkZXYpOworCWlmIChlcnIpIHsKKwkJZGV2X2Vycihw ZmRldi0+ZGV2LCAiZGV2ZnJlcSBpbml0IGZhaWxlZCAlZFxuIiwgZXJyKTsKKwkJZ290byBlcnJf b3V0MDsKKwl9CisKIAllcnIgPSBwYW5mcm9zdF9yZWd1bGF0b3JfaW5pdChwZmRldik7CiAJaWYg KGVycikgewogCQlkZXZfZXJyKHBmZGV2LT5kZXYsICJyZWd1bGF0b3IgaW5pdCBmYWlsZWQgJWRc biIsIGVycik7Ci0JCWdvdG8gZXJyX291dDA7CisJCWdvdG8gZXJyX291dDE7CiAJfQogCiAJZXJy ID0gcGFuZnJvc3RfcmVzZXRfaW5pdChwZmRldik7CiAJaWYgKGVycikgewogCQlkZXZfZXJyKHBm ZGV2LT5kZXYsICJyZXNldCBpbml0IGZhaWxlZCAlZFxuIiwgZXJyKTsKLQkJZ290byBlcnJfb3V0 MTsKKwkJZ290byBlcnJfb3V0MjsKIAl9CiAKIAllcnIgPSBwYW5mcm9zdF9wbV9kb21haW5faW5p dChwZmRldik7CiAJaWYgKGVycikKLQkJZ290byBlcnJfb3V0MjsKKwkJZ290byBlcnJfb3V0MzsK IAogCXJlcyA9IHBsYXRmb3JtX2dldF9yZXNvdXJjZShwZmRldi0+cGRldiwgSU9SRVNPVVJDRV9N RU0sIDApOwogCXBmZGV2LT5pb21lbSA9IGRldm1faW9yZW1hcF9yZXNvdXJjZShwZmRldi0+ZGV2 LCByZXMpOwogCWlmIChJU19FUlIocGZkZXYtPmlvbWVtKSkgewogCQlkZXZfZXJyKHBmZGV2LT5k ZXYsICJmYWlsZWQgdG8gaW9yZW1hcCBpb21lbVxuIik7CiAJCWVyciA9IFBUUl9FUlIocGZkZXYt PmlvbWVtKTsKLQkJZ290byBlcnJfb3V0MzsKKwkJZ290byBlcnJfb3V0NDsKIAl9CiAKIAllcnIg PSBwYW5mcm9zdF9ncHVfaW5pdChwZmRldik7CiAJaWYgKGVycikKLQkJZ290byBlcnJfb3V0MzsK KwkJZ290byBlcnJfb3V0NDsKIAogCWVyciA9IHBhbmZyb3N0X21tdV9pbml0KHBmZGV2KTsKIAlp ZiAoZXJyKQotCQlnb3RvIGVycl9vdXQ0OworCQlnb3RvIGVycl9vdXQ1OwogCiAJZXJyID0gcGFu ZnJvc3Rfam9iX2luaXQocGZkZXYpOwogCWlmIChlcnIpCi0JCWdvdG8gZXJyX291dDU7CisJCWdv dG8gZXJyX291dDY7CiAKIAllcnIgPSBwYW5mcm9zdF9wZXJmY250X2luaXQocGZkZXYpOwogCWlm IChlcnIpCi0JCWdvdG8gZXJyX291dDY7CisJCWdvdG8gZXJyX291dDc7CiAKIAlyZXR1cm4gMDsK LWVycl9vdXQ2OgorZXJyX291dDc6CiAJcGFuZnJvc3Rfam9iX2ZpbmkocGZkZXYpOwotZXJyX291 dDU6CitlcnJfb3V0NjoKIAlwYW5mcm9zdF9tbXVfZmluaShwZmRldik7Ci1lcnJfb3V0NDoKK2Vy cl9vdXQ1OgogCXBhbmZyb3N0X2dwdV9maW5pKHBmZGV2KTsKLWVycl9vdXQzOgorZXJyX291dDQ6 CiAJcGFuZnJvc3RfcG1fZG9tYWluX2ZpbmkocGZkZXYpOwotZXJyX291dDI6CitlcnJfb3V0MzoK IAlwYW5mcm9zdF9yZXNldF9maW5pKHBmZGV2KTsKLWVycl9vdXQxOgorZXJyX291dDI6CiAJcGFu ZnJvc3RfcmVndWxhdG9yX2ZpbmkocGZkZXYpOworZXJyX291dDE6CisJcGFuZnJvc3RfZGV2ZnJl cV9maW5pKHBmZGV2KTsKIGVycl9vdXQwOgogCXBhbmZyb3N0X2Nsa19maW5pKHBmZGV2KTsKIAly ZXR1cm4gZXJyOwpAQCAtMjc4LDYgKzI4Niw3IEBAIHZvaWQgcGFuZnJvc3RfZGV2aWNlX2Zpbmko c3RydWN0IHBhbmZyb3N0X2RldmljZSAqcGZkZXYpCiAJcGFuZnJvc3RfZ3B1X2ZpbmkocGZkZXYp OwogCXBhbmZyb3N0X3BtX2RvbWFpbl9maW5pKHBmZGV2KTsKIAlwYW5mcm9zdF9yZXNldF9maW5p KHBmZGV2KTsKKwlwYW5mcm9zdF9kZXZmcmVxX2ZpbmkocGZkZXYpOwogCXBhbmZyb3N0X3JlZ3Vs YXRvcl9maW5pKHBmZGV2KTsKIAlwYW5mcm9zdF9jbGtfZmluaShwZmRldik7CiB9CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMgYi9kcml2ZXJzL2dw dS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMKaW5kZXggODgyZmVjYzMzZmRiLi40ZGRhNjg2 ODkwMTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9kcnYu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMKQEAgLTE0LDcg KzE0LDYgQEAKICNpbmNsdWRlIDxkcm0vZHJtX3V0aWxzLmg+CiAKICNpbmNsdWRlICJwYW5mcm9z dF9kZXZpY2UuaCIKLSNpbmNsdWRlICJwYW5mcm9zdF9kZXZmcmVxLmgiCiAjaW5jbHVkZSAicGFu ZnJvc3RfZ2VtLmgiCiAjaW5jbHVkZSAicGFuZnJvc3RfbW11LmgiCiAjaW5jbHVkZSAicGFuZnJv c3Rfam9iLmgiCkBAIC02MDYsMTMgKzYwNSw2IEBAIHN0YXRpYyBpbnQgcGFuZnJvc3RfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJZ290byBlcnJfb3V0MDsKIAl9CiAKLQll cnIgPSBwYW5mcm9zdF9kZXZmcmVxX2luaXQocGZkZXYpOwotCWlmIChlcnIpIHsKLQkJaWYgKGVy ciAhPSAtRVBST0JFX0RFRkVSKQotCQkJZGV2X2VycigmcGRldi0+ZGV2LCAiRmF0YWwgZXJyb3Ig ZHVyaW5nIGRldmZyZXEgaW5pdFxuIik7Ci0JCWdvdG8gZXJyX291dDE7Ci0JfQotCiAJcG1fcnVu dGltZV9zZXRfYWN0aXZlKHBmZGV2LT5kZXYpOwogCXBtX3J1bnRpbWVfbWFya19sYXN0X2J1c3ko cGZkZXYtPmRldik7CiAJcG1fcnVudGltZV9lbmFibGUocGZkZXYtPmRldik7CkBAIC02MjUsMTYg KzYxNywxNCBAQCBzdGF0aWMgaW50IHBhbmZyb3N0X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZp Y2UgKnBkZXYpCiAJICovCiAJZXJyID0gZHJtX2Rldl9yZWdpc3RlcihkZGV2LCAwKTsKIAlpZiAo ZXJyIDwgMCkKLQkJZ290byBlcnJfb3V0MjsKKwkJZ290byBlcnJfb3V0MTsKIAogCXBhbmZyb3N0 X2dlbV9zaHJpbmtlcl9pbml0KGRkZXYpOwogCiAJcmV0dXJuIDA7CiAKLWVycl9vdXQyOgotCXBt X3J1bnRpbWVfZGlzYWJsZShwZmRldi0+ZGV2KTsKLQlwYW5mcm9zdF9kZXZmcmVxX2ZpbmkocGZk ZXYpOwogZXJyX291dDE6CisJcG1fcnVudGltZV9kaXNhYmxlKHBmZGV2LT5kZXYpOwogCXBhbmZy b3N0X2RldmljZV9maW5pKHBmZGV2KTsKIGVycl9vdXQwOgogCWRybV9kZXZfcHV0KGRkZXYpOwpA QCAtNjUwLDcgKzY0MCw2IEBAIHN0YXRpYyBpbnQgcGFuZnJvc3RfcmVtb3ZlKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYpCiAJcGFuZnJvc3RfZ2VtX3Nocmlua2VyX2NsZWFudXAoZGRldik7 CiAKIAlwbV9ydW50aW1lX2dldF9zeW5jKHBmZGV2LT5kZXYpOwotCXBhbmZyb3N0X2RldmZyZXFf ZmluaShwZmRldik7CiAJcGFuZnJvc3RfZGV2aWNlX2ZpbmkocGZkZXYpOwogCXBtX3J1bnRpbWVf cHV0X3N5bmNfc3VzcGVuZChwZmRldi0+ZGV2KTsKIAlwbV9ydW50aW1lX2Rpc2FibGUocGZkZXYt PmRldik7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=