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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 43544C07E96 for ; Thu, 8 Jul 2021 17:38:59 +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 1A5186191E for ; Thu, 8 Jul 2021 17:38:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A5186191E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 245C76E978; Thu, 8 Jul 2021 17:38:29 +0000 (UTC) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB3C26E959 for ; Thu, 8 Jul 2021 17:38:27 +0000 (UTC) Received: by mail-wm1-x32e.google.com with SMTP id h18-20020a05600c3512b029020e4ceb9588so7353346wmq.5 for ; Thu, 08 Jul 2021 10:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ebIVcjLJn4N3cEp+a/U762UEiwT+qt4xG10RVlPtYgw=; b=V18SbWHRGAR0zaN1sDQqgrRvQVKR2QugENmQ3+2W+3uswRppw/EuQ/2IMbfimsozFR qRr0kr/33FiO5ZZCnsVyM28Fc0fnEnyI125flwX1bgz8M5NVfIn7wyS7Baia0fcub66Z 96r1V8+iqi13G3SKIhi7it5D628LnBTeUOsVE= 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=ebIVcjLJn4N3cEp+a/U762UEiwT+qt4xG10RVlPtYgw=; b=BaOV/cDplcxoH4yvgx6hrLKhuRD+1FNGG1BTN0hwe5KuRBrYh870uNuU5LlHxSTqGS +GyoOM6B9rcAnrc9ONJIw9wilfd3Tl0JmMprmpP/Gg0aYfZuflmcnslUjzjJLSFBQ8nE 2wMfMGB+/MCURmk/07bl7HmeGMi1aSaG2VR3ahqyDzpSDzvscQpoJ8bhX8tJXAtSD1/c rjAVfMhUccsfSE5k7F+gN8WtbMgI7KpsjPdAxniioWMEcvmKx10xY97INNXS7683qw+X 25pkXUd9kfCLdT61SEWktU/VTIWS7jN3Kj4yCDBr2UeipFyEv9BZVQKF8nlKbJWj0kON 2U+A== X-Gm-Message-State: AOAM530gNm+vZkSPmATVooOuRHMc7nxSEkNKnqKK4VhkJfQYRrYbVs+4 rysOWSw76QX2WgLvOU+Ds6Zz1Xhlk553dQ== X-Google-Smtp-Source: ABdhPJyXMCVFCRWFtTsFH7OGVjH31NfKozJkh19X67sH8spSB4P11xfISDzhzh0HFdxxQrmKkRgDMA== X-Received: by 2002:a7b:c34d:: with SMTP id l13mr6524321wmj.99.1625765906233; Thu, 08 Jul 2021 10:38:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l4sm2521853wme.26.2021.07.08.10.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 10:38:25 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH v3 18/20] drm/i915: delete exclude argument from i915_sw_fence_await_reservation Date: Thu, 8 Jul 2021 19:37:52 +0200 Message-Id: <20210708173754.3877540-19-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> References: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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?Thomas=20Hellstr=C3=B6m?= , Daniel Vetter , Intel Graphics Development , Jason Ekstrand , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" No longer used, the last user disappeared with commit d07f0e59b2c762584478920cd2d11fba2980a94a Author: Chris Wilson Date: Fri Oct 28 13:58:44 2016 +0100 drm/i915: Move GEM activity tracking into a common struct reservation_object Signed-off-by: Daniel Vetter Cc: Maarten Lankhorst Cc: "Thomas Hellström" Cc: Jason Ekstrand --- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_sw_fence.c | 6 +----- drivers/gpu/drm/i915/i915_sw_fence.h | 1 - 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 98e0f4ed7e4a..678c7839034e 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -11119,7 +11119,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, */ if (intel_crtc_needs_modeset(crtc_state)) { ret = i915_sw_fence_await_reservation(&state->commit_ready, - old_obj->base.resv, NULL, + old_obj->base.resv, false, 0, GFP_KERNEL); if (ret < 0) @@ -11153,7 +11153,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, struct dma_fence *fence; ret = i915_sw_fence_await_reservation(&state->commit_ready, - obj->base.resv, NULL, + obj->base.resv, false, i915_fence_timeout(dev_priv), GFP_KERNEL); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c index daf9284ef1f5..93439d2c7a58 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c @@ -106,7 +106,7 @@ bool i915_gem_clflush_object(struct drm_i915_gem_object *obj, clflush = clflush_work_create(obj); if (clflush) { i915_sw_fence_await_reservation(&clflush->base.chain, - obj->base.resv, NULL, true, + obj->base.resv, true, i915_fence_timeout(to_i915(obj->base.dev)), I915_FENCE_GFP); dma_resv_add_excl_fence(obj->base.resv, &clflush->base.dma); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 68ce366f46cf..47e07179347a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -2095,7 +2095,7 @@ static int eb_parse_pipeline(struct i915_execbuffer *eb, /* Wait for all writes (and relocs) into the batch to complete */ err = i915_sw_fence_await_reservation(&pw->base.chain, - pw->batch->resv, NULL, false, + pw->batch->resv, false, 0, I915_FENCE_GFP); if (err < 0) goto err_commit; diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index c589a681da77..91711a46b1c7 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -567,7 +567,6 @@ int __i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence, int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, struct dma_resv *resv, - const struct dma_fence_ops *exclude, bool write, unsigned long timeout, gfp_t gfp) @@ -587,9 +586,6 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, return ret; for (i = 0; i < count; i++) { - if (shared[i]->ops == exclude) - continue; - pending = i915_sw_fence_await_dma_fence(fence, shared[i], timeout, @@ -609,7 +605,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, excl = dma_resv_get_excl_unlocked(resv); } - if (ret >= 0 && excl && excl->ops != exclude) { + if (ret >= 0 && excl) { pending = i915_sw_fence_await_dma_fence(fence, excl, timeout, diff --git a/drivers/gpu/drm/i915/i915_sw_fence.h b/drivers/gpu/drm/i915/i915_sw_fence.h index 30a863353ee6..6572f01668e4 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.h +++ b/drivers/gpu/drm/i915/i915_sw_fence.h @@ -86,7 +86,6 @@ int i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence, int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, struct dma_resv *resv, - const struct dma_fence_ops *exclude, bool write, unsigned long timeout, gfp_t gfp); -- 2.32.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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 16B32C07E9C for ; Thu, 8 Jul 2021 17:38: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 E06F76191D for ; Thu, 8 Jul 2021 17:38:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E06F76191D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F3916E984; Thu, 8 Jul 2021 17:38:29 +0000 (UTC) Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0B926E97F for ; Thu, 8 Jul 2021 17:38:27 +0000 (UTC) Received: by mail-wm1-x329.google.com with SMTP id b14-20020a1c1b0e0000b02901fc3a62af78so7326015wmb.3 for ; Thu, 08 Jul 2021 10:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ebIVcjLJn4N3cEp+a/U762UEiwT+qt4xG10RVlPtYgw=; b=V18SbWHRGAR0zaN1sDQqgrRvQVKR2QugENmQ3+2W+3uswRppw/EuQ/2IMbfimsozFR qRr0kr/33FiO5ZZCnsVyM28Fc0fnEnyI125flwX1bgz8M5NVfIn7wyS7Baia0fcub66Z 96r1V8+iqi13G3SKIhi7it5D628LnBTeUOsVE= 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=ebIVcjLJn4N3cEp+a/U762UEiwT+qt4xG10RVlPtYgw=; b=hAo25I+aEXrFo6os/iJPQR0Adn3anYtxKcjT9D2naUyz/g9zIx/j6kchIw/2w4ZQJ+ C0Th5qp0YpAY8Iaks4ivw2HCk23O4rlBsDErMgbd1WFZxSrv3KLRE3bRfxMq+rz+S1nd 8Jid+EJMSBEpf2geGrJLzqsNtIJFTiIhO3SIWDHkZvaguono+drQVlgA/vZ/MRW6bzER w/IhAINm5czP8AaDrbU/+WCrSQej6sOjWAw4YqpVNBGs0obWf2CSVB/QWNmQHlMM6xR5 VpHxuoUSGLlnmqTbwEhlJou9ZAr+ScRlMFH5lE3KSp2cNBaW2gzX83G+jrJ5VMbP84i6 9OpA== X-Gm-Message-State: AOAM531D0M2uOVf4s4Jjh8nG6T+Id0FxzY5bTiCHJkAq0virxDEnn5+b 7LmXjFu0nsuV80JZQwaIDTinsuLs5OTj/w== X-Google-Smtp-Source: ABdhPJyXMCVFCRWFtTsFH7OGVjH31NfKozJkh19X67sH8spSB4P11xfISDzhzh0HFdxxQrmKkRgDMA== X-Received: by 2002:a7b:c34d:: with SMTP id l13mr6524321wmj.99.1625765906233; Thu, 08 Jul 2021 10:38:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l4sm2521853wme.26.2021.07.08.10.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 10:38:25 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 8 Jul 2021 19:37:52 +0200 Message-Id: <20210708173754.3877540-19-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> References: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 18/20] drm/i915: delete exclude argument from i915_sw_fence_await_reservation X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Daniel Vetter , Intel Graphics Development , Daniel Vetter Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Tm8gbG9uZ2VyIHVzZWQsIHRoZSBsYXN0IHVzZXIgZGlzYXBwZWFyZWQgd2l0aAoKY29tbWl0IGQw N2YwZTU5YjJjNzYyNTg0NDc4OTIwY2QyZDExZmJhMjk4MGE5NGEKQXV0aG9yOiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KRGF0ZTogICBGcmkgT2N0IDI4IDEzOjU4OjQ0 IDIwMTYgKzAxMDAKCiAgICBkcm0vaTkxNTogTW92ZSBHRU0gYWN0aXZpdHkgdHJhY2tpbmcgaW50 byBhIGNvbW1vbiBzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0CgpTaWduZWQtb2ZmLWJ5OiBEYW5p ZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0 IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiAiVGhvbWFzIEhlbGxzdHLD tm0iIDx0aG9tYXMuaGVsbHN0cm9tQGxpbnV4LmludGVsLmNvbT4KQ2M6IEphc29uIEVrc3RyYW5k IDxqYXNvbkBqbGVrc3RyYW5kLm5ldD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXkuYyAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkx NV9nZW1fY2xmbHVzaC5jICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVf Z2VtX2V4ZWNidWZmZXIuYyB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVu Y2UuYyAgICAgICAgICAgfCA2ICstLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zd19m ZW5jZS5oICAgICAgICAgICB8IDEgLQogNSBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyks IDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggOThlMGY0ZWQ3ZTRhLi42NzhjNzgzOTAzNGUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTExOSw3ICsxMTExOSw3 IEBAIGludGVsX3ByZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAogCQkg Ki8KIAkJaWYgKGludGVsX2NydGNfbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkgewogCQkJcmV0 ID0gaTkxNV9zd19mZW5jZV9hd2FpdF9yZXNlcnZhdGlvbigmc3RhdGUtPmNvbW1pdF9yZWFkeSwK LQkJCQkJCQkgICAgICBvbGRfb2JqLT5iYXNlLnJlc3YsIE5VTEwsCisJCQkJCQkJICAgICAgb2xk X29iai0+YmFzZS5yZXN2LAogCQkJCQkJCSAgICAgIGZhbHNlLCAwLAogCQkJCQkJCSAgICAgIEdG UF9LRVJORUwpOwogCQkJaWYgKHJldCA8IDApCkBAIC0xMTE1Myw3ICsxMTE1Myw3IEBAIGludGVs X3ByZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAogCQlzdHJ1Y3QgZG1h X2ZlbmNlICpmZW5jZTsKIAogCQlyZXQgPSBpOTE1X3N3X2ZlbmNlX2F3YWl0X3Jlc2VydmF0aW9u KCZzdGF0ZS0+Y29tbWl0X3JlYWR5LAotCQkJCQkJICAgICAgb2JqLT5iYXNlLnJlc3YsIE5VTEws CisJCQkJCQkgICAgICBvYmotPmJhc2UucmVzdiwKIAkJCQkJCSAgICAgIGZhbHNlLAogCQkJCQkJ ICAgICAgaTkxNV9mZW5jZV90aW1lb3V0KGRldl9wcml2KSwKIAkJCQkJCSAgICAgIEdGUF9LRVJO RUwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX2NsZmx1 c2guYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9jbGZsdXNoLmMKaW5kZXgg ZGFmOTI4NGVmMWY1Li45MzQzOWQyYzdhNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2dlbS9pOTE1X2dlbV9jbGZsdXNoLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2Vt L2k5MTVfZ2VtX2NsZmx1c2guYwpAQCAtMTA2LDcgKzEwNiw3IEBAIGJvb2wgaTkxNV9nZW1fY2xm bHVzaF9vYmplY3Qoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJY2xmbHVzaCA9 IGNsZmx1c2hfd29ya19jcmVhdGUob2JqKTsKIAlpZiAoY2xmbHVzaCkgewogCQlpOTE1X3N3X2Zl bmNlX2F3YWl0X3Jlc2VydmF0aW9uKCZjbGZsdXNoLT5iYXNlLmNoYWluLAotCQkJCQkJb2JqLT5i YXNlLnJlc3YsIE5VTEwsIHRydWUsCisJCQkJCQlvYmotPmJhc2UucmVzdiwgdHJ1ZSwKIAkJCQkJ CWk5MTVfZmVuY2VfdGltZW91dCh0b19pOTE1KG9iai0+YmFzZS5kZXYpKSwKIAkJCQkJCUk5MTVf RkVOQ0VfR0ZQKTsKIAkJZG1hX3Jlc3ZfYWRkX2V4Y2xfZmVuY2Uob2JqLT5iYXNlLnJlc3YsICZj bGZsdXNoLT5iYXNlLmRtYSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0v aTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYwppbmRleCA2OGNlMzY2ZjQ2Y2YuLjQ3ZTA3MTc5MzQ3YSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0yMDk1LDcg KzIwOTUsNyBAQCBzdGF0aWMgaW50IGViX3BhcnNlX3BpcGVsaW5lKHN0cnVjdCBpOTE1X2V4ZWNi dWZmZXIgKmViLAogCiAJLyogV2FpdCBmb3IgYWxsIHdyaXRlcyAoYW5kIHJlbG9jcykgaW50byB0 aGUgYmF0Y2ggdG8gY29tcGxldGUgKi8KIAllcnIgPSBpOTE1X3N3X2ZlbmNlX2F3YWl0X3Jlc2Vy dmF0aW9uKCZwdy0+YmFzZS5jaGFpbiwKLQkJCQkJICAgICAgcHctPmJhdGNoLT5yZXN2LCBOVUxM LCBmYWxzZSwKKwkJCQkJICAgICAgcHctPmJhdGNoLT5yZXN2LCBmYWxzZSwKIAkJCQkJICAgICAg MCwgSTkxNV9GRU5DRV9HRlApOwogCWlmIChlcnIgPCAwKQogCQlnb3RvIGVycl9jb21taXQ7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMKaW5kZXggYzU4OWE2ODFkYTc3Li45MTcxMWE0 NmIxYzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVuY2UuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMKQEAgLTU2Nyw3ICs1Njcs NiBAQCBpbnQgX19pOTE1X3N3X2ZlbmNlX2F3YWl0X2RtYV9mZW5jZShzdHJ1Y3QgaTkxNV9zd19m ZW5jZSAqZmVuY2UsCiAKIGludCBpOTE1X3N3X2ZlbmNlX2F3YWl0X3Jlc2VydmF0aW9uKHN0cnVj dCBpOTE1X3N3X2ZlbmNlICpmZW5jZSwKIAkJCQkgICAgc3RydWN0IGRtYV9yZXN2ICpyZXN2LAot CQkJCSAgICBjb25zdCBzdHJ1Y3QgZG1hX2ZlbmNlX29wcyAqZXhjbHVkZSwKIAkJCQkgICAgYm9v bCB3cml0ZSwKIAkJCQkgICAgdW5zaWduZWQgbG9uZyB0aW1lb3V0LAogCQkJCSAgICBnZnBfdCBn ZnApCkBAIC01ODcsOSArNTg2LDYgQEAgaW50IGk5MTVfc3dfZmVuY2VfYXdhaXRfcmVzZXJ2YXRp b24oc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAogCQkJcmV0dXJuIHJldDsKIAogCQlmb3Ig KGkgPSAwOyBpIDwgY291bnQ7IGkrKykgewotCQkJaWYgKHNoYXJlZFtpXS0+b3BzID09IGV4Y2x1 ZGUpCi0JCQkJY29udGludWU7Ci0KIAkJCXBlbmRpbmcgPSBpOTE1X3N3X2ZlbmNlX2F3YWl0X2Rt YV9mZW5jZShmZW5jZSwKIAkJCQkJCQkJc2hhcmVkW2ldLAogCQkJCQkJCQl0aW1lb3V0LApAQCAt NjA5LDcgKzYwNSw3IEBAIGludCBpOTE1X3N3X2ZlbmNlX2F3YWl0X3Jlc2VydmF0aW9uKHN0cnVj dCBpOTE1X3N3X2ZlbmNlICpmZW5jZSwKIAkJZXhjbCA9IGRtYV9yZXN2X2dldF9leGNsX3VubG9j a2VkKHJlc3YpOwogCX0KIAotCWlmIChyZXQgPj0gMCAmJiBleGNsICYmIGV4Y2wtPm9wcyAhPSBl eGNsdWRlKSB7CisJaWYgKHJldCA+PSAwICYmIGV4Y2wpIHsKIAkJcGVuZGluZyA9IGk5MTVfc3df ZmVuY2VfYXdhaXRfZG1hX2ZlbmNlKGZlbmNlLAogCQkJCQkJCWV4Y2wsCiAJCQkJCQkJdGltZW91 dCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVuY2UuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVuY2UuaAppbmRleCAzMGE4NjMzNTNlZTYuLjY1 NzJmMDE2NjhlNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zd19mZW5j ZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVuY2UuaApAQCAtODYsNyAr ODYsNiBAQCBpbnQgaTkxNV9zd19mZW5jZV9hd2FpdF9kbWFfZmVuY2Uoc3RydWN0IGk5MTVfc3df ZmVuY2UgKmZlbmNlLAogCiBpbnQgaTkxNV9zd19mZW5jZV9hd2FpdF9yZXNlcnZhdGlvbihzdHJ1 Y3QgaTkxNV9zd19mZW5jZSAqZmVuY2UsCiAJCQkJICAgIHN0cnVjdCBkbWFfcmVzdiAqcmVzdiwK LQkJCQkgICAgY29uc3Qgc3RydWN0IGRtYV9mZW5jZV9vcHMgKmV4Y2x1ZGUsCiAJCQkJICAgIGJv b2wgd3JpdGUsCiAJCQkJICAgIHVuc2lnbmVkIGxvbmcgdGltZW91dCwKIAkJCQkgICAgZ2ZwX3Qg Z2ZwKTsKLS0gCjIuMzIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==