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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 991A1C64E7D for ; Fri, 27 Nov 2020 16:42:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CD9D22245 for ; Fri, 27 Nov 2020 16:42:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="ZUgYtuqu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731324AbgK0QmA (ORCPT ); Fri, 27 Nov 2020 11:42:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731523AbgK0QmA (ORCPT ); Fri, 27 Nov 2020 11:42:00 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF597C0617A7 for ; Fri, 27 Nov 2020 08:41:59 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id 64so6184002wra.11 for ; Fri, 27 Nov 2020 08:41:59 -0800 (PST) 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=/sh5bs9TsYHYjvxKHF7f8Ku58Ybt71LSBBC/IzYD81Y=; b=ZUgYtuqulcoekyn4/DmS1kFLLSpaYhGwPtaiS4etvDJ4hqCcKQ9cof4OsFdlK+OZwX /ER9XnkoUa8V6V6Qw8vMOYFotLZdmZyietIl3Zsl8wbRwbLmxfViSl5mIrxb8X/uTceC yaR+5hwHDEsE+H9iZ92RvTlkLr27AxXM+Atr4= 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=/sh5bs9TsYHYjvxKHF7f8Ku58Ybt71LSBBC/IzYD81Y=; b=mnPpbgatAZKG7Ppi8Z+C7G5bNK+XZwCo7xai/GkQAhMs0p1O9eFRORf80ciWqiV0oH z9iWQJbFR/3+YtbtzOQ+3j4K7DYpMjIbX4lKWaQ2n4eG0xSZ4mosQ4x009q9ac9z5hkT Yw3ChWyKx4K4Xyza3ozDgEFr+Ztq6mrSCHruKW1NRGCKkp0/B9aNolH756N2v6YnBXOZ MylnouWFslO+/CL4JaYcfMAf+xBU67LGlzR2yrjoNJrMu2deRShCiqBhWR1yxsbThXF3 y4Y5KxkhUp5apKi/E9wedd6kq6w05pmgWU+Xg0XRl3seW8nuBPluXqmqptnO/J6H8Cch EGYw== X-Gm-Message-State: AOAM533FQbuFSIO88U5HpBB23f4c5fSTZh+fWxP7+TbSFRDijHyL9rCh +qPi3LOwvXkPwWiF7ZcFY1ORAw== X-Google-Smtp-Source: ABdhPJxrHFLYiVOKd4LtxuEtdsZyIsxVIgBM9ROp4FnD1+Tfa5L6neNEaRf8jGsJWtkGxmbFQqkP0g== X-Received: by 2002:adf:e54f:: with SMTP id z15mr12003413wrm.159.1606495318430; Fri, 27 Nov 2020 08:41:58 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q12sm14859078wrx.86.2020.11.27.08.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 08:41:57 -0800 (PST) From: Daniel Vetter To: DRI Development , LKML Cc: kvm@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org, Daniel Vetter , John Hubbard , Daniel Vetter , Jason Gunthorpe , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Kukjin Kim , Krzysztof Kozlowski , Andrew Morton , Christoph Hellwig , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jan Kara , Dan Williams Subject: [PATCH v7 01/17] drm/exynos: Stop using frame_vector helpers Date: Fri, 27 Nov 2020 17:41:15 +0100 Message-Id: <20201127164131.2244124-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> References: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org All we need are a pages array, pin_user_pages_fast can give us that directly. Plus this avoids the entire raw pfn side of get_vaddr_frames. Note that pin_user_pages_fast is a safe replacement despite the seeming lack of checking for vma->vm_flasg & (VM_IO | VM_PFNMAP). Such ptes are marked with pte_mkspecial (which pup_fast rejects in the fastpath), and only architectures supporting that support the pin_user_pages_fast fastpath. Reviewed-by: John Hubbard Signed-off-by: Daniel Vetter Cc: Jason Gunthorpe Cc: Inki Dae Cc: Joonyoung Shim Cc: Seung-Woo Kim Cc: Kyungmin Park Cc: Kukjin Kim Cc: Krzysztof Kozlowski Cc: Andrew Morton Cc: John Hubbard Cc: Christoph Hellwig Cc: Jérôme Glisse Cc: Jan Kara Cc: Dan Williams Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-media@vger.kernel.org Signed-off-by: Daniel Vetter -- v2: Use unpin_user_pages_dirty_lock (John) v6: Explain why pup_fast is safe, after discussions with John and Christoph. --- drivers/gpu/drm/exynos/Kconfig | 1 - drivers/gpu/drm/exynos/exynos_drm_g2d.c | 47 +++++++++++-------------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 951d5f708e92..6a251e3aa779 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -89,7 +89,6 @@ comment "Sub-drivers" config DRM_EXYNOS_G2D bool "G2D" depends on VIDEO_SAMSUNG_S5P_G2D=n || COMPILE_TEST - select FRAME_VECTOR help Choose this option if you want to use Exynos G2D for DRM. diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 967a5cdc120e..ecede41af9b9 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -205,7 +205,8 @@ struct g2d_cmdlist_userptr { dma_addr_t dma_addr; unsigned long userptr; unsigned long size; - struct frame_vector *vec; + struct page **pages; + unsigned int npages; struct sg_table *sgt; atomic_t refcount; bool in_pool; @@ -378,7 +379,6 @@ static void g2d_userptr_put_dma_addr(struct g2d_data *g2d, bool force) { struct g2d_cmdlist_userptr *g2d_userptr = obj; - struct page **pages; if (!obj) return; @@ -398,15 +398,9 @@ static void g2d_userptr_put_dma_addr(struct g2d_data *g2d, dma_unmap_sgtable(to_dma_dev(g2d->drm_dev), g2d_userptr->sgt, DMA_BIDIRECTIONAL, 0); - pages = frame_vector_pages(g2d_userptr->vec); - if (!IS_ERR(pages)) { - int i; - - for (i = 0; i < frame_vector_count(g2d_userptr->vec); i++) - set_page_dirty_lock(pages[i]); - } - put_vaddr_frames(g2d_userptr->vec); - frame_vector_destroy(g2d_userptr->vec); + unpin_user_pages_dirty_lock(g2d_userptr->pages, g2d_userptr->npages, + true); + kvfree(g2d_userptr->pages); if (!g2d_userptr->out_of_list) list_del_init(&g2d_userptr->list); @@ -474,35 +468,34 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, offset = userptr & ~PAGE_MASK; end = PAGE_ALIGN(userptr + size); npages = (end - start) >> PAGE_SHIFT; - g2d_userptr->vec = frame_vector_create(npages); - if (!g2d_userptr->vec) { + g2d_userptr->pages = kvmalloc_array(npages, sizeof(*g2d_userptr->pages), + GFP_KERNEL); + if (!g2d_userptr->pages) { ret = -ENOMEM; goto err_free; } - ret = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE, - g2d_userptr->vec); + ret = pin_user_pages_fast(start, npages, FOLL_FORCE | FOLL_WRITE, + g2d_userptr->pages); if (ret != npages) { DRM_DEV_ERROR(g2d->dev, "failed to get user pages from userptr.\n"); if (ret < 0) - goto err_destroy_framevec; - ret = -EFAULT; - goto err_put_framevec; - } - if (frame_vector_to_pages(g2d_userptr->vec) < 0) { + goto err_destroy_pages; + npages = ret; ret = -EFAULT; - goto err_put_framevec; + goto err_unpin_pages; } + g2d_userptr->npages = npages; sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); if (!sgt) { ret = -ENOMEM; - goto err_put_framevec; + goto err_unpin_pages; } ret = sg_alloc_table_from_pages(sgt, - frame_vector_pages(g2d_userptr->vec), + g2d_userptr->pages, npages, offset, size, GFP_KERNEL); if (ret < 0) { DRM_DEV_ERROR(g2d->dev, "failed to get sgt from pages.\n"); @@ -538,11 +531,11 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, err_free_sgt: kfree(sgt); -err_put_framevec: - put_vaddr_frames(g2d_userptr->vec); +err_unpin_pages: + unpin_user_pages(g2d_userptr->pages, npages); -err_destroy_framevec: - frame_vector_destroy(g2d_userptr->vec); +err_destroy_pages: + kvfree(g2d_userptr->pages); err_free: kfree(g2d_userptr); -- 2.29.2 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 0B442C8248E for ; Fri, 27 Nov 2020 16:44:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 73211206D8 for ; Fri, 27 Nov 2020 16:44:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FIaybdT0"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="ZUgYtuqu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73211206D8 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+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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L5uN1Zy+fZrj5iG+UWUDyjtQFh1vFToJFv40D5dg49k=; b=FIaybdT03OwSo33n8U9SFzWy/ 3Tc3wLnHEQweIPO11t5rTDce3oRICBMOgJfNhiiZjYefkUknVmBXZoLUZNW4724pB6hyn2kUxQDrw KtQITKTHsh2lZaELBWyYAzu8nDVWAzXmr3tqm3Q5SpJaRWHV/zFjZnIvLZ3wYAD2LkAeD3FKQqOMt FaFosfm/YQcdK2+B8Pu8Xm7KobGeh/H+6a9qSKmOc/3eCishHsosOkxCGDIhVTvlFy7Pvr2w/SgmS hIPJFmGfBZL//M8+q4muVaHSrmGBzZYnjcKK8ftPpDySpgvJ8B8lpnMHNnTZfj994aQulTdjc5mU4 qvtx+6xcQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kigpD-0007vl-DR; Fri, 27 Nov 2020 16:42:23 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kigor-0007jx-0h for linux-arm-kernel@lists.infradead.org; Fri, 27 Nov 2020 16:42:07 +0000 Received: by mail-wr1-x444.google.com with SMTP id 23so6209403wrc.8 for ; Fri, 27 Nov 2020 08:41:59 -0800 (PST) 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=/sh5bs9TsYHYjvxKHF7f8Ku58Ybt71LSBBC/IzYD81Y=; b=ZUgYtuqulcoekyn4/DmS1kFLLSpaYhGwPtaiS4etvDJ4hqCcKQ9cof4OsFdlK+OZwX /ER9XnkoUa8V6V6Qw8vMOYFotLZdmZyietIl3Zsl8wbRwbLmxfViSl5mIrxb8X/uTceC yaR+5hwHDEsE+H9iZ92RvTlkLr27AxXM+Atr4= 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=/sh5bs9TsYHYjvxKHF7f8Ku58Ybt71LSBBC/IzYD81Y=; b=AImbpL0Uhoiacl31h3kYI0zlM62GcmOZduEPDA43PVjnon+JHVCByY/+Og5lqsn6fE lPd6TWzpQ80Wc/CN7u8Aiu2jm87s1Ppbp8JMFnxBLeYoSL8i/iGcgQs/VYmmqzlmKOcP sk7PeqKl4eNT2vEQ4Y4CxVEDLCphQG85Kb+KGsaiqUGq0z24uq/UCw0CA9LhDJ4QRTSg LY4/FgbF3n5Fx87E0frqV4HnldphKWt63lOkC8x2MTlkPpmJ81mrpGY5QzQEij+ZwdaS eno77Za/VoBHZ8Ui0JU36fY0Z4pdUp6oFnRv7lzPOSU+o4G6XRKvn6t/dwW84xXTHoTg YNZQ== X-Gm-Message-State: AOAM530Gv9E+tIzbk+DcHKQITDo7J5hAAZzq/WzWsvneeFNsA5tBuosm vxFPWFE3nJ7vGYlcVxZjQNVGfQ== X-Google-Smtp-Source: ABdhPJxrHFLYiVOKd4LtxuEtdsZyIsxVIgBM9ROp4FnD1+Tfa5L6neNEaRf8jGsJWtkGxmbFQqkP0g== X-Received: by 2002:adf:e54f:: with SMTP id z15mr12003413wrm.159.1606495318430; Fri, 27 Nov 2020 08:41:58 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q12sm14859078wrx.86.2020.11.27.08.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 08:41:57 -0800 (PST) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v7 01/17] drm/exynos: Stop using frame_vector helpers Date: Fri, 27 Nov 2020 17:41:15 +0100 Message-Id: <20201127164131.2244124-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> References: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201127_114201_089335_740D8104 X-CRM114-Status: GOOD ( 23.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christoph Hellwig , linux-samsung-soc@vger.kernel.org, Jan Kara , Joonyoung Shim , kvm@vger.kernel.org, Jason Gunthorpe , Daniel Vetter , Seung-Woo Kim , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Krzysztof Kozlowski , Inki Dae , linux-mm@kvack.org, Kyungmin Park , Kukjin Kim , John Hubbard , Daniel Vetter , Andrew Morton , Dan Williams , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org QWxsIHdlIG5lZWQgYXJlIGEgcGFnZXMgYXJyYXksIHBpbl91c2VyX3BhZ2VzX2Zhc3QgY2FuIGdp dmUgdXMgdGhhdApkaXJlY3RseS4gUGx1cyB0aGlzIGF2b2lkcyB0aGUgZW50aXJlIHJhdyBwZm4g c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKTm90ZSB0aGF0IHBpbl91c2VyX3BhZ2VzX2Zhc3Qg aXMgYSBzYWZlIHJlcGxhY2VtZW50IGRlc3BpdGUgdGhlCnNlZW1pbmcgbGFjayBvZiBjaGVja2lu ZyBmb3Igdm1hLT52bV9mbGFzZyAmIChWTV9JTyB8IFZNX1BGTk1BUCkuIFN1Y2gKcHRlcyBhcmUg bWFya2VkIHdpdGggcHRlX21rc3BlY2lhbCAod2hpY2ggcHVwX2Zhc3QgcmVqZWN0cyBpbiB0aGUK ZmFzdHBhdGgpLCBhbmQgb25seSBhcmNoaXRlY3R1cmVzIHN1cHBvcnRpbmcgdGhhdCBzdXBwb3J0 IHRoZQpwaW5fdXNlcl9wYWdlc19mYXN0IGZhc3RwYXRoLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHVi YmFyZCA8amh1YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5j YT4KQ2M6IElua2kgRGFlIDxpbmtpLmRhZUBzYW1zdW5nLmNvbT4KQ2M6IEpvb255b3VuZyBTaGlt IDxqeTA5MjIuc2hpbUBzYW1zdW5nLmNvbT4KQ2M6IFNldW5nLVdvbyBLaW0gPHN3MDMxMi5raW1A c2Ftc3VuZy5jb20+CkNjOiBLeXVuZ21pbiBQYXJrIDxreXVuZ21pbi5wYXJrQHNhbXN1bmcuY29t PgpDYzogS3VramluIEtpbSA8a2dlbmVAa2VybmVsLm9yZz4KQ2M6IEtyenlzenRvZiBLb3psb3dz a2kgPGtyemtAa2VybmVsLm9yZz4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRh dGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBDaHJp c3RvcGggSGVsbHdpZyA8aGNoQGluZnJhZGVhZC5vcmc+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpn bGlzc2VAcmVkaGF0LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2ls bGlhbXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpD YzogbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5n LXNvY0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpTaWdu ZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLQp2Mjog VXNlIHVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayAoSm9obikKdjY6IEV4cGxhaW4gd2h5IHB1 cF9mYXN0IGlzIHNhZmUsIGFmdGVyIGRpc2N1c3Npb25zIHdpdGggSm9obiBhbmQKQ2hyaXN0b3Bo LgotLS0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvS2NvbmZpZyAgICAgICAgICB8ICAxIC0KIGRy aXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nMmQuYyB8IDQ3ICsrKysrKysrKysrLS0t LS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnIGIvZHJp dmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnCmluZGV4IDk1MWQ1ZjcwOGU5Mi4uNmEyNTFlM2Fh Nzc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL0tjb25maWcKKysrIGIvZHJp dmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnCkBAIC04OSw3ICs4OSw2IEBAIGNvbW1lbnQgIlN1 Yi1kcml2ZXJzIgogY29uZmlnIERSTV9FWFlOT1NfRzJECiAJYm9vbCAiRzJEIgogCWRlcGVuZHMg b24gVklERU9fU0FNU1VOR19TNVBfRzJEPW4gfHwgQ09NUElMRV9URVNUCi0Jc2VsZWN0IEZSQU1F X1ZFQ1RPUgogCWhlbHAKIAkgIENob29zZSB0aGlzIG9wdGlvbiBpZiB5b3Ugd2FudCB0byB1c2Ug RXh5bm9zIEcyRCBmb3IgRFJNLgogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9z L2V4eW5vc19kcm1fZzJkLmMgYi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZzJk LmMKaW5kZXggOTY3YTVjZGMxMjBlLi5lY2VkZTQxYWY5YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nMmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZXh5 bm9zL2V4eW5vc19kcm1fZzJkLmMKQEAgLTIwNSw3ICsyMDUsOCBAQCBzdHJ1Y3QgZzJkX2NtZGxp c3RfdXNlcnB0ciB7CiAJZG1hX2FkZHJfdAkJZG1hX2FkZHI7CiAJdW5zaWduZWQgbG9uZwkJdXNl cnB0cjsKIAl1bnNpZ25lZCBsb25nCQlzaXplOwotCXN0cnVjdCBmcmFtZV92ZWN0b3IJKnZlYzsK KwlzdHJ1Y3QgcGFnZQkJKipwYWdlczsKKwl1bnNpZ25lZCBpbnQJCW5wYWdlczsKIAlzdHJ1Y3Qg c2dfdGFibGUJCSpzZ3Q7CiAJYXRvbWljX3QJCXJlZmNvdW50OwogCWJvb2wJCQlpbl9wb29sOwpA QCAtMzc4LDcgKzM3OSw2IEBAIHN0YXRpYyB2b2lkIGcyZF91c2VycHRyX3B1dF9kbWFfYWRkcihz dHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIAkJCQkJYm9vbCBmb3JjZSkKIHsKIAlzdHJ1Y3QgZzJkX2Nt ZGxpc3RfdXNlcnB0ciAqZzJkX3VzZXJwdHIgPSBvYmo7Ci0Jc3RydWN0IHBhZ2UgKipwYWdlczsK IAogCWlmICghb2JqKQogCQlyZXR1cm47CkBAIC0zOTgsMTUgKzM5OCw5IEBAIHN0YXRpYyB2b2lk IGcyZF91c2VycHRyX3B1dF9kbWFfYWRkcihzdHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIAlkbWFfdW5t YXBfc2d0YWJsZSh0b19kbWFfZGV2KGcyZC0+ZHJtX2RldiksIGcyZF91c2VycHRyLT5zZ3QsCiAJ CQkgIERNQV9CSURJUkVDVElPTkFMLCAwKTsKIAotCXBhZ2VzID0gZnJhbWVfdmVjdG9yX3BhZ2Vz KGcyZF91c2VycHRyLT52ZWMpOwotCWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlpbnQgaTsKLQot CQlmb3IgKGkgPSAwOyBpIDwgZnJhbWVfdmVjdG9yX2NvdW50KGcyZF91c2VycHRyLT52ZWMpOyBp KyspCi0JCQlzZXRfcGFnZV9kaXJ0eV9sb2NrKHBhZ2VzW2ldKTsKLQl9Ci0JcHV0X3ZhZGRyX2Zy YW1lcyhnMmRfdXNlcnB0ci0+dmVjKTsKLQlmcmFtZV92ZWN0b3JfZGVzdHJveShnMmRfdXNlcnB0 ci0+dmVjKTsKKwl1bnBpbl91c2VyX3BhZ2VzX2RpcnR5X2xvY2soZzJkX3VzZXJwdHItPnBhZ2Vz LCBnMmRfdXNlcnB0ci0+bnBhZ2VzLAorCQkJCSAgICB0cnVlKTsKKwlrdmZyZWUoZzJkX3VzZXJw dHItPnBhZ2VzKTsKIAogCWlmICghZzJkX3VzZXJwdHItPm91dF9vZl9saXN0KQogCQlsaXN0X2Rl bF9pbml0KCZnMmRfdXNlcnB0ci0+bGlzdCk7CkBAIC00NzQsMzUgKzQ2OCwzNCBAQCBzdGF0aWMg ZG1hX2FkZHJfdCAqZzJkX3VzZXJwdHJfZ2V0X2RtYV9hZGRyKHN0cnVjdCBnMmRfZGF0YSAqZzJk LAogCW9mZnNldCA9IHVzZXJwdHIgJiB+UEFHRV9NQVNLOwogCWVuZCA9IFBBR0VfQUxJR04odXNl cnB0ciArIHNpemUpOwogCW5wYWdlcyA9IChlbmQgLSBzdGFydCkgPj4gUEFHRV9TSElGVDsKLQln MmRfdXNlcnB0ci0+dmVjID0gZnJhbWVfdmVjdG9yX2NyZWF0ZShucGFnZXMpOwotCWlmICghZzJk X3VzZXJwdHItPnZlYykgeworCWcyZF91c2VycHRyLT5wYWdlcyA9IGt2bWFsbG9jX2FycmF5KG5w YWdlcywgc2l6ZW9mKCpnMmRfdXNlcnB0ci0+cGFnZXMpLAorCQkJCQkgICAgR0ZQX0tFUk5FTCk7 CisJaWYgKCFnMmRfdXNlcnB0ci0+cGFnZXMpIHsKIAkJcmV0ID0gLUVOT01FTTsKIAkJZ290byBl cnJfZnJlZTsKIAl9CiAKLQlyZXQgPSBnZXRfdmFkZHJfZnJhbWVzKHN0YXJ0LCBucGFnZXMsIEZP TExfRk9SQ0UgfCBGT0xMX1dSSVRFLAotCQlnMmRfdXNlcnB0ci0+dmVjKTsKKwlyZXQgPSBwaW5f dXNlcl9wYWdlc19mYXN0KHN0YXJ0LCBucGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAor CQkJCSAgZzJkX3VzZXJwdHItPnBhZ2VzKTsKIAlpZiAocmV0ICE9IG5wYWdlcykgewogCQlEUk1f REVWX0VSUk9SKGcyZC0+ZGV2LAogCQkJICAgICAgImZhaWxlZCB0byBnZXQgdXNlciBwYWdlcyBm cm9tIHVzZXJwdHIuXG4iKTsKIAkJaWYgKHJldCA8IDApCi0JCQlnb3RvIGVycl9kZXN0cm95X2Zy YW1ldmVjOwotCQlyZXQgPSAtRUZBVUxUOwotCQlnb3RvIGVycl9wdXRfZnJhbWV2ZWM7Ci0JfQot CWlmIChmcmFtZV92ZWN0b3JfdG9fcGFnZXMoZzJkX3VzZXJwdHItPnZlYykgPCAwKSB7CisJCQln b3RvIGVycl9kZXN0cm95X3BhZ2VzOworCQlucGFnZXMgPSByZXQ7CiAJCXJldCA9IC1FRkFVTFQ7 Ci0JCWdvdG8gZXJyX3B1dF9mcmFtZXZlYzsKKwkJZ290byBlcnJfdW5waW5fcGFnZXM7CiAJfQor CWcyZF91c2VycHRyLT5ucGFnZXMgPSBucGFnZXM7CiAKIAlzZ3QgPSBremFsbG9jKHNpemVvZigq c2d0KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFzZ3QpIHsKIAkJcmV0ID0gLUVOT01FTTsKLQkJZ290 byBlcnJfcHV0X2ZyYW1ldmVjOworCQlnb3RvIGVycl91bnBpbl9wYWdlczsKIAl9CiAKIAlyZXQg PSBzZ19hbGxvY190YWJsZV9mcm9tX3BhZ2VzKHNndCwKLQkJCQkJZnJhbWVfdmVjdG9yX3BhZ2Vz KGcyZF91c2VycHRyLT52ZWMpLAorCQkJCQlnMmRfdXNlcnB0ci0+cGFnZXMsCiAJCQkJCW5wYWdl cywgb2Zmc2V0LCBzaXplLCBHRlBfS0VSTkVMKTsKIAlpZiAocmV0IDwgMCkgewogCQlEUk1fREVW X0VSUk9SKGcyZC0+ZGV2LCAiZmFpbGVkIHRvIGdldCBzZ3QgZnJvbSBwYWdlcy5cbiIpOwpAQCAt NTM4LDExICs1MzEsMTEgQEAgc3RhdGljIGRtYV9hZGRyX3QgKmcyZF91c2VycHRyX2dldF9kbWFf YWRkcihzdHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIGVycl9mcmVlX3NndDoKIAlrZnJlZShzZ3QpOwog Ci1lcnJfcHV0X2ZyYW1ldmVjOgotCXB1dF92YWRkcl9mcmFtZXMoZzJkX3VzZXJwdHItPnZlYyk7 CitlcnJfdW5waW5fcGFnZXM6CisJdW5waW5fdXNlcl9wYWdlcyhnMmRfdXNlcnB0ci0+cGFnZXMs IG5wYWdlcyk7CiAKLWVycl9kZXN0cm95X2ZyYW1ldmVjOgotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95 KGcyZF91c2VycHRyLT52ZWMpOworZXJyX2Rlc3Ryb3lfcGFnZXM6CisJa3ZmcmVlKGcyZF91c2Vy cHRyLT5wYWdlcyk7CiAKIGVycl9mcmVlOgogCWtmcmVlKGcyZF91c2VycHRyKTsKLS0gCjIuMjku MgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4 LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFk Lm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFy bS1rZXJuZWwK 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.5 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 C653AC63798 for ; Fri, 27 Nov 2020 16:42:06 +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 62245206D8 for ; Fri, 27 Nov 2020 16:42:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="ZUgYtuqu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62245206D8 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 736E06EE5B; Fri, 27 Nov 2020 16:42:01 +0000 (UTC) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29D2D6EE5B for ; Fri, 27 Nov 2020 16:42:00 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id g14so6168317wrm.13 for ; Fri, 27 Nov 2020 08:42:00 -0800 (PST) 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=/sh5bs9TsYHYjvxKHF7f8Ku58Ybt71LSBBC/IzYD81Y=; b=ZUgYtuqulcoekyn4/DmS1kFLLSpaYhGwPtaiS4etvDJ4hqCcKQ9cof4OsFdlK+OZwX /ER9XnkoUa8V6V6Qw8vMOYFotLZdmZyietIl3Zsl8wbRwbLmxfViSl5mIrxb8X/uTceC yaR+5hwHDEsE+H9iZ92RvTlkLr27AxXM+Atr4= 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=/sh5bs9TsYHYjvxKHF7f8Ku58Ybt71LSBBC/IzYD81Y=; b=mHBSKtsgAcX75l4GVEwqyybJbHeJz0EaQf3kC6pdO9YhK7XzogHHS8OU13DyUTaT4+ VJjhxjufXXL0YJvcfMp7xnQlwPdnPin8q0vlwR7r3cZ8aB37UWTSbxTObscXPQwN+r8V WepJKlfl53Ai5yZG5buHOd+KnG6FyF78yzwm5iD1PHuf5tEcgj+jtJJDXHVb0klCfrcR KPEvMyPyhSatUH3PiGYI8d8qNQNrA8JGINBc7bV+HJ89Xw84sK0l1LOKbXaWxliVYMQG 1YqUEAV2jSILEmD3oi5zHjozx7VCxhLVAu00lzkPPs+jKmWC2P9QR6rWruXdPLhz40+z Yi9g== X-Gm-Message-State: AOAM533W8bfKqZgmWMvMuAEw0kllZ8HYB5cxit4gL9af3eRmCa4rtQTO tV9sZSAB2N8WGzC+6zxb6SFktYtxt8zHGA== X-Google-Smtp-Source: ABdhPJxrHFLYiVOKd4LtxuEtdsZyIsxVIgBM9ROp4FnD1+Tfa5L6neNEaRf8jGsJWtkGxmbFQqkP0g== X-Received: by 2002:adf:e54f:: with SMTP id z15mr12003413wrm.159.1606495318430; Fri, 27 Nov 2020 08:41:58 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q12sm14859078wrx.86.2020.11.27.08.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 08:41:57 -0800 (PST) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v7 01/17] drm/exynos: Stop using frame_vector helpers Date: Fri, 27 Nov 2020 17:41:15 +0100 Message-Id: <20201127164131.2244124-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> References: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 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: Christoph Hellwig , linux-samsung-soc@vger.kernel.org, Jan Kara , Joonyoung Shim , kvm@vger.kernel.org, Jason Gunthorpe , Daniel Vetter , Seung-Woo Kim , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Krzysztof Kozlowski , linux-mm@kvack.org, Kyungmin Park , Kukjin Kim , John Hubbard , Daniel Vetter , Andrew Morton , Dan Williams , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" QWxsIHdlIG5lZWQgYXJlIGEgcGFnZXMgYXJyYXksIHBpbl91c2VyX3BhZ2VzX2Zhc3QgY2FuIGdp dmUgdXMgdGhhdApkaXJlY3RseS4gUGx1cyB0aGlzIGF2b2lkcyB0aGUgZW50aXJlIHJhdyBwZm4g c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKTm90ZSB0aGF0IHBpbl91c2VyX3BhZ2VzX2Zhc3Qg aXMgYSBzYWZlIHJlcGxhY2VtZW50IGRlc3BpdGUgdGhlCnNlZW1pbmcgbGFjayBvZiBjaGVja2lu ZyBmb3Igdm1hLT52bV9mbGFzZyAmIChWTV9JTyB8IFZNX1BGTk1BUCkuIFN1Y2gKcHRlcyBhcmUg bWFya2VkIHdpdGggcHRlX21rc3BlY2lhbCAod2hpY2ggcHVwX2Zhc3QgcmVqZWN0cyBpbiB0aGUK ZmFzdHBhdGgpLCBhbmQgb25seSBhcmNoaXRlY3R1cmVzIHN1cHBvcnRpbmcgdGhhdCBzdXBwb3J0 IHRoZQpwaW5fdXNlcl9wYWdlc19mYXN0IGZhc3RwYXRoLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHVi YmFyZCA8amh1YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5j YT4KQ2M6IElua2kgRGFlIDxpbmtpLmRhZUBzYW1zdW5nLmNvbT4KQ2M6IEpvb255b3VuZyBTaGlt IDxqeTA5MjIuc2hpbUBzYW1zdW5nLmNvbT4KQ2M6IFNldW5nLVdvbyBLaW0gPHN3MDMxMi5raW1A c2Ftc3VuZy5jb20+CkNjOiBLeXVuZ21pbiBQYXJrIDxreXVuZ21pbi5wYXJrQHNhbXN1bmcuY29t PgpDYzogS3VramluIEtpbSA8a2dlbmVAa2VybmVsLm9yZz4KQ2M6IEtyenlzenRvZiBLb3psb3dz a2kgPGtyemtAa2VybmVsLm9yZz4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRh dGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBDaHJp c3RvcGggSGVsbHdpZyA8aGNoQGluZnJhZGVhZC5vcmc+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpn bGlzc2VAcmVkaGF0LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2ls bGlhbXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpD YzogbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5n LXNvY0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpTaWdu ZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLQp2Mjog VXNlIHVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayAoSm9obikKdjY6IEV4cGxhaW4gd2h5IHB1 cF9mYXN0IGlzIHNhZmUsIGFmdGVyIGRpc2N1c3Npb25zIHdpdGggSm9obiBhbmQKQ2hyaXN0b3Bo LgotLS0KIGRyaXZlcnMvZ3B1L2RybS9leHlub3MvS2NvbmZpZyAgICAgICAgICB8ICAxIC0KIGRy aXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nMmQuYyB8IDQ3ICsrKysrKysrKysrLS0t LS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnIGIvZHJp dmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnCmluZGV4IDk1MWQ1ZjcwOGU5Mi4uNmEyNTFlM2Fh Nzc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL0tjb25maWcKKysrIGIvZHJp dmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnCkBAIC04OSw3ICs4OSw2IEBAIGNvbW1lbnQgIlN1 Yi1kcml2ZXJzIgogY29uZmlnIERSTV9FWFlOT1NfRzJECiAJYm9vbCAiRzJEIgogCWRlcGVuZHMg b24gVklERU9fU0FNU1VOR19TNVBfRzJEPW4gfHwgQ09NUElMRV9URVNUCi0Jc2VsZWN0IEZSQU1F X1ZFQ1RPUgogCWhlbHAKIAkgIENob29zZSB0aGlzIG9wdGlvbiBpZiB5b3Ugd2FudCB0byB1c2Ug RXh5bm9zIEcyRCBmb3IgRFJNLgogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9z L2V4eW5vc19kcm1fZzJkLmMgYi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZzJk LmMKaW5kZXggOTY3YTVjZGMxMjBlLi5lY2VkZTQxYWY5YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9leHlub3MvZXh5bm9zX2RybV9nMmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZXh5 bm9zL2V4eW5vc19kcm1fZzJkLmMKQEAgLTIwNSw3ICsyMDUsOCBAQCBzdHJ1Y3QgZzJkX2NtZGxp c3RfdXNlcnB0ciB7CiAJZG1hX2FkZHJfdAkJZG1hX2FkZHI7CiAJdW5zaWduZWQgbG9uZwkJdXNl cnB0cjsKIAl1bnNpZ25lZCBsb25nCQlzaXplOwotCXN0cnVjdCBmcmFtZV92ZWN0b3IJKnZlYzsK KwlzdHJ1Y3QgcGFnZQkJKipwYWdlczsKKwl1bnNpZ25lZCBpbnQJCW5wYWdlczsKIAlzdHJ1Y3Qg c2dfdGFibGUJCSpzZ3Q7CiAJYXRvbWljX3QJCXJlZmNvdW50OwogCWJvb2wJCQlpbl9wb29sOwpA QCAtMzc4LDcgKzM3OSw2IEBAIHN0YXRpYyB2b2lkIGcyZF91c2VycHRyX3B1dF9kbWFfYWRkcihz dHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIAkJCQkJYm9vbCBmb3JjZSkKIHsKIAlzdHJ1Y3QgZzJkX2Nt ZGxpc3RfdXNlcnB0ciAqZzJkX3VzZXJwdHIgPSBvYmo7Ci0Jc3RydWN0IHBhZ2UgKipwYWdlczsK IAogCWlmICghb2JqKQogCQlyZXR1cm47CkBAIC0zOTgsMTUgKzM5OCw5IEBAIHN0YXRpYyB2b2lk IGcyZF91c2VycHRyX3B1dF9kbWFfYWRkcihzdHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIAlkbWFfdW5t YXBfc2d0YWJsZSh0b19kbWFfZGV2KGcyZC0+ZHJtX2RldiksIGcyZF91c2VycHRyLT5zZ3QsCiAJ CQkgIERNQV9CSURJUkVDVElPTkFMLCAwKTsKIAotCXBhZ2VzID0gZnJhbWVfdmVjdG9yX3BhZ2Vz KGcyZF91c2VycHRyLT52ZWMpOwotCWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlpbnQgaTsKLQot CQlmb3IgKGkgPSAwOyBpIDwgZnJhbWVfdmVjdG9yX2NvdW50KGcyZF91c2VycHRyLT52ZWMpOyBp KyspCi0JCQlzZXRfcGFnZV9kaXJ0eV9sb2NrKHBhZ2VzW2ldKTsKLQl9Ci0JcHV0X3ZhZGRyX2Zy YW1lcyhnMmRfdXNlcnB0ci0+dmVjKTsKLQlmcmFtZV92ZWN0b3JfZGVzdHJveShnMmRfdXNlcnB0 ci0+dmVjKTsKKwl1bnBpbl91c2VyX3BhZ2VzX2RpcnR5X2xvY2soZzJkX3VzZXJwdHItPnBhZ2Vz LCBnMmRfdXNlcnB0ci0+bnBhZ2VzLAorCQkJCSAgICB0cnVlKTsKKwlrdmZyZWUoZzJkX3VzZXJw dHItPnBhZ2VzKTsKIAogCWlmICghZzJkX3VzZXJwdHItPm91dF9vZl9saXN0KQogCQlsaXN0X2Rl bF9pbml0KCZnMmRfdXNlcnB0ci0+bGlzdCk7CkBAIC00NzQsMzUgKzQ2OCwzNCBAQCBzdGF0aWMg ZG1hX2FkZHJfdCAqZzJkX3VzZXJwdHJfZ2V0X2RtYV9hZGRyKHN0cnVjdCBnMmRfZGF0YSAqZzJk LAogCW9mZnNldCA9IHVzZXJwdHIgJiB+UEFHRV9NQVNLOwogCWVuZCA9IFBBR0VfQUxJR04odXNl cnB0ciArIHNpemUpOwogCW5wYWdlcyA9IChlbmQgLSBzdGFydCkgPj4gUEFHRV9TSElGVDsKLQln MmRfdXNlcnB0ci0+dmVjID0gZnJhbWVfdmVjdG9yX2NyZWF0ZShucGFnZXMpOwotCWlmICghZzJk X3VzZXJwdHItPnZlYykgeworCWcyZF91c2VycHRyLT5wYWdlcyA9IGt2bWFsbG9jX2FycmF5KG5w YWdlcywgc2l6ZW9mKCpnMmRfdXNlcnB0ci0+cGFnZXMpLAorCQkJCQkgICAgR0ZQX0tFUk5FTCk7 CisJaWYgKCFnMmRfdXNlcnB0ci0+cGFnZXMpIHsKIAkJcmV0ID0gLUVOT01FTTsKIAkJZ290byBl cnJfZnJlZTsKIAl9CiAKLQlyZXQgPSBnZXRfdmFkZHJfZnJhbWVzKHN0YXJ0LCBucGFnZXMsIEZP TExfRk9SQ0UgfCBGT0xMX1dSSVRFLAotCQlnMmRfdXNlcnB0ci0+dmVjKTsKKwlyZXQgPSBwaW5f dXNlcl9wYWdlc19mYXN0KHN0YXJ0LCBucGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAor CQkJCSAgZzJkX3VzZXJwdHItPnBhZ2VzKTsKIAlpZiAocmV0ICE9IG5wYWdlcykgewogCQlEUk1f REVWX0VSUk9SKGcyZC0+ZGV2LAogCQkJICAgICAgImZhaWxlZCB0byBnZXQgdXNlciBwYWdlcyBm cm9tIHVzZXJwdHIuXG4iKTsKIAkJaWYgKHJldCA8IDApCi0JCQlnb3RvIGVycl9kZXN0cm95X2Zy YW1ldmVjOwotCQlyZXQgPSAtRUZBVUxUOwotCQlnb3RvIGVycl9wdXRfZnJhbWV2ZWM7Ci0JfQot CWlmIChmcmFtZV92ZWN0b3JfdG9fcGFnZXMoZzJkX3VzZXJwdHItPnZlYykgPCAwKSB7CisJCQln b3RvIGVycl9kZXN0cm95X3BhZ2VzOworCQlucGFnZXMgPSByZXQ7CiAJCXJldCA9IC1FRkFVTFQ7 Ci0JCWdvdG8gZXJyX3B1dF9mcmFtZXZlYzsKKwkJZ290byBlcnJfdW5waW5fcGFnZXM7CiAJfQor CWcyZF91c2VycHRyLT5ucGFnZXMgPSBucGFnZXM7CiAKIAlzZ3QgPSBremFsbG9jKHNpemVvZigq c2d0KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFzZ3QpIHsKIAkJcmV0ID0gLUVOT01FTTsKLQkJZ290 byBlcnJfcHV0X2ZyYW1ldmVjOworCQlnb3RvIGVycl91bnBpbl9wYWdlczsKIAl9CiAKIAlyZXQg PSBzZ19hbGxvY190YWJsZV9mcm9tX3BhZ2VzKHNndCwKLQkJCQkJZnJhbWVfdmVjdG9yX3BhZ2Vz KGcyZF91c2VycHRyLT52ZWMpLAorCQkJCQlnMmRfdXNlcnB0ci0+cGFnZXMsCiAJCQkJCW5wYWdl cywgb2Zmc2V0LCBzaXplLCBHRlBfS0VSTkVMKTsKIAlpZiAocmV0IDwgMCkgewogCQlEUk1fREVW X0VSUk9SKGcyZC0+ZGV2LCAiZmFpbGVkIHRvIGdldCBzZ3QgZnJvbSBwYWdlcy5cbiIpOwpAQCAt NTM4LDExICs1MzEsMTEgQEAgc3RhdGljIGRtYV9hZGRyX3QgKmcyZF91c2VycHRyX2dldF9kbWFf YWRkcihzdHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIGVycl9mcmVlX3NndDoKIAlrZnJlZShzZ3QpOwog Ci1lcnJfcHV0X2ZyYW1ldmVjOgotCXB1dF92YWRkcl9mcmFtZXMoZzJkX3VzZXJwdHItPnZlYyk7 CitlcnJfdW5waW5fcGFnZXM6CisJdW5waW5fdXNlcl9wYWdlcyhnMmRfdXNlcnB0ci0+cGFnZXMs IG5wYWdlcyk7CiAKLWVycl9kZXN0cm95X2ZyYW1ldmVjOgotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95 KGcyZF91c2VycHRyLT52ZWMpOworZXJyX2Rlc3Ryb3lfcGFnZXM6CisJa3ZmcmVlKGcyZF91c2Vy cHRyLT5wYWdlcyk7CiAKIGVycl9mcmVlOgogCWtmcmVlKGcyZF91c2VycHRyKTsKLS0gCjIuMjku MgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==