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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 0CB07C5DF9D for ; Mon, 26 Oct 2020 11:01:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE4C32225C for ; Mon, 26 Oct 2020 11:01:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="UlPNDMGy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1773051AbgJZLBA (ORCPT ); Mon, 26 Oct 2020 07:01:00 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33290 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1772315AbgJZK63 (ORCPT ); Mon, 26 Oct 2020 06:58:29 -0400 Received: by mail-wm1-f67.google.com with SMTP id l20so4893964wme.0 for ; Mon, 26 Oct 2020 03:58: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=5HSDx6z2iUpxgLk7STJ2LBrJWLho+Vrj3pPui9pXoI8=; b=UlPNDMGyixYlC+gPNujgEL2rDmgBnacLev+zB09AcN9jWsIhwDD/rSZ38jOBVqq8xO iKAMMw2Dn+O1sn5M45MuUANko75LMiByct+0sTK4Y1zG/mkhWRt6wfXXCeYyMZpxuDFP ohoyHxlTs9ukBeuTT1XZ/1TieNop7LHOqq+kU= 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=5HSDx6z2iUpxgLk7STJ2LBrJWLho+Vrj3pPui9pXoI8=; b=fFZUIPHqyvLNKt70TETIIm3cVsUsPJEb151DKHvjV97el+WvUO6xDLXmQt/bE3WEd7 eYVlvUBIpbsthfo61BRh5+vVpskpYKkH1q4fkCUYH3+Ur6JCpCecj/5Fjiq35btLav1O 9GwAAJMtUMJjuP8rIQfxXcGwMux7/99bPTPiLFv30rrdrAqEIISWMf4seAiaVfFkWqK2 uNEn4EA8U0oj5cHaOa4l0h2L6tIvicXa/kxShqm0KyQ6+8I8rbirELcdW589zXlMrONL CpBOuRLz8w94WhT1ro0PdKhAX9bh//0CJbrqJ8jtWntgVwIwTZD+ngEOKjhuo3eIvA6Z vX4g== X-Gm-Message-State: AOAM532n/Zc7BqseiP7JxzH/2t7HUWNbIkWq6yD2OU7tQuKM4UgsDCgs MP2HU3yMojnt1Ixfc4ocX6qubA== X-Google-Smtp-Source: ABdhPJwk+WyO7L+7DmDEv6NKzv9NT0FNUGzlLjoe/puysIw3cSVvPS9bRY2rLzmA6270BRM/TeV4wg== X-Received: by 2002:a05:600c:25a:: with SMTP id 26mr14956631wmj.39.1603709906608; Mon, 26 Oct 2020 03:58:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id w83sm21165156wmg.48.2020.10.26.03.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:58:25 -0700 (PDT) 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, linux-s390@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 , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jan Kara , Dan Williams Subject: [PATCH v4 01/15] drm/exynos: Stop using frame_vector helpers Date: Mon, 26 Oct 2020 11:58:04 +0100 Message-Id: <20201026105818.2585306-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026105818.2585306-1-daniel.vetter@ffwll.ch> References: <20201026105818.2585306-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-kernel@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. 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: 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) --- 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 6417f374b923..43257ef3c09d 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -88,7 +88,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.28.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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 D1C1AC56202 for ; Mon, 26 Oct 2020 11:01:00 +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 8650822277 for ; Mon, 26 Oct 2020 11:01: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="DakoGNnT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="UlPNDMGy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8650822277 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=Sone9hI1Fijdo5iZJXnjQEXPjQPLjs73xjnDGxBcFUM=; b=DakoGNnTIWNcFzmBqa8CUGGkW 62fzk6MbNnT+4O2nO64+RBWjswGJwr828mz06IvMYm6CkHUghlyzt9B3uEsNYdb7FrlOx61scMdDO xYblfai3r31rarP2RkUgQuQbGp7DiAt7crIC9pFhHs2DLvoFmCY+RRlIRkB8Hfhwwy3b0ivIwQf3A O6wXlUgUCfyRuf9v8sCNFkHoN16LJ9CJ8MRamCH4CBf3mHA+Ro4O89xRrCrmITJvW710iVN6JNTlc Anidt3XMwZXQ4yYQrElG43yl+mJ6g7yJAdmPzOvNxFBwf3StgBdsK+78C7y8K0hWbEe06gdpwFkso 219WZ7pRQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX0Da-0002Fp-H8; Mon, 26 Oct 2020 10:59:14 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX0Cr-0001so-1W for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 10:58:32 +0000 Received: by mail-wm1-x341.google.com with SMTP id l15so11982853wmi.3 for ; Mon, 26 Oct 2020 03:58: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=5HSDx6z2iUpxgLk7STJ2LBrJWLho+Vrj3pPui9pXoI8=; b=UlPNDMGyixYlC+gPNujgEL2rDmgBnacLev+zB09AcN9jWsIhwDD/rSZ38jOBVqq8xO iKAMMw2Dn+O1sn5M45MuUANko75LMiByct+0sTK4Y1zG/mkhWRt6wfXXCeYyMZpxuDFP ohoyHxlTs9ukBeuTT1XZ/1TieNop7LHOqq+kU= 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=5HSDx6z2iUpxgLk7STJ2LBrJWLho+Vrj3pPui9pXoI8=; b=DlE27vGV73p3/noFn1PPotB5I+XyCfyjOIq0pSGKZd0QhkoY+ssMOYjwwrBgW2aLCh Y+xfWORKI5i5KriBLgpjU4wHRR9YsBJl0JEjyof2EJky9wL47LS49jVz62Mpod4ypXuv ls3PenJx8Wj0noclyR6TWGxvfelvN8Fn4qnnG2qkrs2RfkLh6NSWgeW0RuD5mtwR9Kf/ /VpNUfxOwrCNfdffx6xmCf+3Xfc7xOjpJiW2T4rh6H0xtdm6U2PR6AAuJQSkTmVIz7Pk ls7Xz52PAVoTdwHmFKa3Xm1r3bka9JDhHk5b49RRKC5qDVRwkkcBZzg3LrLGfULIYDaz Ws4Q== X-Gm-Message-State: AOAM530aGz6Wt2G2jHiLEw8K2uWUx7JTla6zPQJT4FkgJICzS4g/WERg 7FF2g5Pz8EJNd74Ve/Sdtzs83g== X-Google-Smtp-Source: ABdhPJwk+WyO7L+7DmDEv6NKzv9NT0FNUGzlLjoe/puysIw3cSVvPS9bRY2rLzmA6270BRM/TeV4wg== X-Received: by 2002:a05:600c:25a:: with SMTP id 26mr14956631wmj.39.1603709906608; Mon, 26 Oct 2020 03:58:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id w83sm21165156wmg.48.2020.10.26.03.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:58:25 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v4 01/15] drm/exynos: Stop using frame_vector helpers Date: Mon, 26 Oct 2020 11:58:04 +0100 Message-Id: <20201026105818.2585306-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026105818.2585306-1-daniel.vetter@ffwll.ch> References: <20201026105818.2585306-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-20201026_065829_164602_A09951AA X-CRM114-Status: GOOD ( 22.68 ) 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: linux-s390@vger.kernel.org, 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 c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHViYmFyZCA8amh1 YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5jYT4KQ2M6IElu a2kgRGFlIDxpbmtpLmRhZUBzYW1zdW5nLmNvbT4KQ2M6IEpvb255b3VuZyBTaGltIDxqeTA5MjIu c2hpbUBzYW1zdW5nLmNvbT4KQ2M6IFNldW5nLVdvbyBLaW0gPHN3MDMxMi5raW1Ac2Ftc3VuZy5j b20+CkNjOiBLeXVuZ21pbiBQYXJrIDxreXVuZ21pbi5wYXJrQHNhbXN1bmcuY29tPgpDYzogS3Vr amluIEtpbSA8a2dlbmVAa2VybmVsLm9yZz4KQ2M6IEtyenlzenRvZiBLb3psb3dza2kgPGtyemtA a2VybmVsLm9yZz4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+ CkNjOiBKb2huIEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlz c2UgPGpnbGlzc2VAcmVkaGF0LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBE YW4gV2lsbGlhbXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNr Lm9yZwpDYzogbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1z YW1zdW5nLXNvY0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9y ZwpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgot LQp2MjogVXNlIHVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayAoSm9obikKLS0tCiBkcml2ZXJz L2dwdS9kcm0vZXh5bm9zL0tjb25maWcgICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0v ZXh5bm9zL2V4eW5vc19kcm1fZzJkLmMgfCA0NyArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvS2NvbmZpZyBiL2RyaXZlcnMvZ3B1L2RybS9l eHlub3MvS2NvbmZpZwppbmRleCA2NDE3ZjM3NGI5MjMuLjQzMjU3ZWYzYzA5ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9l eHlub3MvS2NvbmZpZwpAQCAtODgsNyArODgsNiBAQCBjb21tZW50ICJTdWItZHJpdmVycyIKIGNv bmZpZyBEUk1fRVhZTk9TX0cyRAogCWJvb2wgIkcyRCIKIAlkZXBlbmRzIG9uIFZJREVPX1NBTVNV TkdfUzVQX0cyRD1uIHx8IENPTVBJTEVfVEVTVAotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAloZWxw CiAJICBDaG9vc2UgdGhpcyBvcHRpb24gaWYgeW91IHdhbnQgdG8gdXNlIEV4eW5vcyBHMkQgZm9y IERSTS4KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2cy ZC5jIGIvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2cyZC5jCmluZGV4IDk2N2E1 Y2RjMTIwZS4uZWNlZGU0MWFmOWI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9z L2V4eW5vc19kcm1fZzJkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJt X2cyZC5jCkBAIC0yMDUsNyArMjA1LDggQEAgc3RydWN0IGcyZF9jbWRsaXN0X3VzZXJwdHIgewog CWRtYV9hZGRyX3QJCWRtYV9hZGRyOwogCXVuc2lnbmVkIGxvbmcJCXVzZXJwdHI7CiAJdW5zaWdu ZWQgbG9uZwkJc2l6ZTsKLQlzdHJ1Y3QgZnJhbWVfdmVjdG9yCSp2ZWM7CisJc3RydWN0IHBhZ2UJ CSoqcGFnZXM7CisJdW5zaWduZWQgaW50CQlucGFnZXM7CiAJc3RydWN0IHNnX3RhYmxlCQkqc2d0 OwogCWF0b21pY190CQlyZWZjb3VudDsKIAlib29sCQkJaW5fcG9vbDsKQEAgLTM3OCw3ICszNzks NiBAQCBzdGF0aWMgdm9pZCBnMmRfdXNlcnB0cl9wdXRfZG1hX2FkZHIoc3RydWN0IGcyZF9kYXRh ICpnMmQsCiAJCQkJCWJvb2wgZm9yY2UpCiB7CiAJc3RydWN0IGcyZF9jbWRsaXN0X3VzZXJwdHIg KmcyZF91c2VycHRyID0gb2JqOwotCXN0cnVjdCBwYWdlICoqcGFnZXM7CiAKIAlpZiAoIW9iaikK IAkJcmV0dXJuOwpAQCAtMzk4LDE1ICszOTgsOSBAQCBzdGF0aWMgdm9pZCBnMmRfdXNlcnB0cl9w dXRfZG1hX2FkZHIoc3RydWN0IGcyZF9kYXRhICpnMmQsCiAJZG1hX3VubWFwX3NndGFibGUodG9f ZG1hX2RldihnMmQtPmRybV9kZXYpLCBnMmRfdXNlcnB0ci0+c2d0LAogCQkJICBETUFfQklESVJF Q1RJT05BTCwgMCk7CiAKLQlwYWdlcyA9IGZyYW1lX3ZlY3Rvcl9wYWdlcyhnMmRfdXNlcnB0ci0+ dmVjKTsKLQlpZiAoIUlTX0VSUihwYWdlcykpIHsKLQkJaW50IGk7Ci0KLQkJZm9yIChpID0gMDsg aSA8IGZyYW1lX3ZlY3Rvcl9jb3VudChnMmRfdXNlcnB0ci0+dmVjKTsgaSsrKQotCQkJc2V0X3Bh Z2VfZGlydHlfbG9jayhwYWdlc1tpXSk7Ci0JfQotCXB1dF92YWRkcl9mcmFtZXMoZzJkX3VzZXJw dHItPnZlYyk7Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3koZzJkX3VzZXJwdHItPnZlYyk7CisJdW5w aW5fdXNlcl9wYWdlc19kaXJ0eV9sb2NrKGcyZF91c2VycHRyLT5wYWdlcywgZzJkX3VzZXJwdHIt Pm5wYWdlcywKKwkJCQkgICAgdHJ1ZSk7CisJa3ZmcmVlKGcyZF91c2VycHRyLT5wYWdlcyk7CiAK IAlpZiAoIWcyZF91c2VycHRyLT5vdXRfb2ZfbGlzdCkKIAkJbGlzdF9kZWxfaW5pdCgmZzJkX3Vz ZXJwdHItPmxpc3QpOwpAQCAtNDc0LDM1ICs0NjgsMzQgQEAgc3RhdGljIGRtYV9hZGRyX3QgKmcy ZF91c2VycHRyX2dldF9kbWFfYWRkcihzdHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIAlvZmZzZXQgPSB1 c2VycHRyICYgflBBR0VfTUFTSzsKIAllbmQgPSBQQUdFX0FMSUdOKHVzZXJwdHIgKyBzaXplKTsK IAlucGFnZXMgPSAoZW5kIC0gc3RhcnQpID4+IFBBR0VfU0hJRlQ7Ci0JZzJkX3VzZXJwdHItPnZl YyA9IGZyYW1lX3ZlY3Rvcl9jcmVhdGUobnBhZ2VzKTsKLQlpZiAoIWcyZF91c2VycHRyLT52ZWMp IHsKKwlnMmRfdXNlcnB0ci0+cGFnZXMgPSBrdm1hbGxvY19hcnJheShucGFnZXMsIHNpemVvZigq ZzJkX3VzZXJwdHItPnBhZ2VzKSwKKwkJCQkJICAgIEdGUF9LRVJORUwpOworCWlmICghZzJkX3Vz ZXJwdHItPnBhZ2VzKSB7CiAJCXJldCA9IC1FTk9NRU07CiAJCWdvdG8gZXJyX2ZyZWU7CiAJfQog Ci0JcmV0ID0gZ2V0X3ZhZGRyX2ZyYW1lcyhzdGFydCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9M TF9XUklURSwKLQkJZzJkX3VzZXJwdHItPnZlYyk7CisJcmV0ID0gcGluX3VzZXJfcGFnZXNfZmFz dChzdGFydCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9MTF9XUklURSwKKwkJCQkgIGcyZF91c2Vy cHRyLT5wYWdlcyk7CiAJaWYgKHJldCAhPSBucGFnZXMpIHsKIAkJRFJNX0RFVl9FUlJPUihnMmQt PmRldiwKIAkJCSAgICAgICJmYWlsZWQgdG8gZ2V0IHVzZXIgcGFnZXMgZnJvbSB1c2VycHRyLlxu Iik7CiAJCWlmIChyZXQgPCAwKQotCQkJZ290byBlcnJfZGVzdHJveV9mcmFtZXZlYzsKLQkJcmV0 ID0gLUVGQVVMVDsKLQkJZ290byBlcnJfcHV0X2ZyYW1ldmVjOwotCX0KLQlpZiAoZnJhbWVfdmVj dG9yX3RvX3BhZ2VzKGcyZF91c2VycHRyLT52ZWMpIDwgMCkgeworCQkJZ290byBlcnJfZGVzdHJv eV9wYWdlczsKKwkJbnBhZ2VzID0gcmV0OwogCQlyZXQgPSAtRUZBVUxUOwotCQlnb3RvIGVycl9w dXRfZnJhbWV2ZWM7CisJCWdvdG8gZXJyX3VucGluX3BhZ2VzOwogCX0KKwlnMmRfdXNlcnB0ci0+ bnBhZ2VzID0gbnBhZ2VzOwogCiAJc2d0ID0ga3phbGxvYyhzaXplb2YoKnNndCksIEdGUF9LRVJO RUwpOwogCWlmICghc2d0KSB7CiAJCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gZXJyX3B1dF9mcmFt ZXZlYzsKKwkJZ290byBlcnJfdW5waW5fcGFnZXM7CiAJfQogCiAJcmV0ID0gc2dfYWxsb2NfdGFi bGVfZnJvbV9wYWdlcyhzZ3QsCi0JCQkJCWZyYW1lX3ZlY3Rvcl9wYWdlcyhnMmRfdXNlcnB0ci0+ dmVjKSwKKwkJCQkJZzJkX3VzZXJwdHItPnBhZ2VzLAogCQkJCQlucGFnZXMsIG9mZnNldCwgc2l6 ZSwgR0ZQX0tFUk5FTCk7CiAJaWYgKHJldCA8IDApIHsKIAkJRFJNX0RFVl9FUlJPUihnMmQtPmRl diwgImZhaWxlZCB0byBnZXQgc2d0IGZyb20gcGFnZXMuXG4iKTsKQEAgLTUzOCwxMSArNTMxLDEx IEBAIHN0YXRpYyBkbWFfYWRkcl90ICpnMmRfdXNlcnB0cl9nZXRfZG1hX2FkZHIoc3RydWN0IGcy ZF9kYXRhICpnMmQsCiBlcnJfZnJlZV9zZ3Q6CiAJa2ZyZWUoc2d0KTsKIAotZXJyX3B1dF9mcmFt ZXZlYzoKLQlwdXRfdmFkZHJfZnJhbWVzKGcyZF91c2VycHRyLT52ZWMpOworZXJyX3VucGluX3Bh Z2VzOgorCXVucGluX3VzZXJfcGFnZXMoZzJkX3VzZXJwdHItPnBhZ2VzLCBucGFnZXMpOwogCi1l cnJfZGVzdHJveV9mcmFtZXZlYzoKLQlmcmFtZV92ZWN0b3JfZGVzdHJveShnMmRfdXNlcnB0ci0+ dmVjKTsKK2Vycl9kZXN0cm95X3BhZ2VzOgorCWt2ZnJlZShnMmRfdXNlcnB0ci0+cGFnZXMpOwog CiBlcnJfZnJlZToKIAlrZnJlZShnMmRfdXNlcnB0cik7Ci0tIAoyLjI4LjAKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1h aWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xp c3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 97F45C63697 for ; Mon, 26 Oct 2020 10:58:34 +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 3245022282 for ; Mon, 26 Oct 2020 10:58:34 +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="UlPNDMGy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3245022282 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 2CFDB6E0E8; Mon, 26 Oct 2020 10:58:31 +0000 (UTC) Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 234AF6E0F3 for ; Mon, 26 Oct 2020 10:58:29 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id h22so878797wmb.0 for ; Mon, 26 Oct 2020 03:58:29 -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=5HSDx6z2iUpxgLk7STJ2LBrJWLho+Vrj3pPui9pXoI8=; b=UlPNDMGyixYlC+gPNujgEL2rDmgBnacLev+zB09AcN9jWsIhwDD/rSZ38jOBVqq8xO iKAMMw2Dn+O1sn5M45MuUANko75LMiByct+0sTK4Y1zG/mkhWRt6wfXXCeYyMZpxuDFP ohoyHxlTs9ukBeuTT1XZ/1TieNop7LHOqq+kU= 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=5HSDx6z2iUpxgLk7STJ2LBrJWLho+Vrj3pPui9pXoI8=; b=nVODuPuLGQZSJnf8vrxjyqQlxQCQXMsh3t8if+ezzMGLcjBvkkG+62VvL+DzTmyZuq pNgzAWA/xQlKyV5ASa7V3Few/YLXbFfxbUbTqerH2+4/l2gMNLZ4PdJeoSpdHHZ5SMJF WG/DBpbB5JtS369yavU838GgUItHENxq5nw5fisBaAuxvSD03YbcK7GqQDCos5exek2f uOWEzkCtkB6FSZJKov638/3p+coHGXjAF9NtJ88dagPbCVROoOtzz3DVZB9nYy3cmQDT rnOJGLHbCPUXfLRIWgwLuvxtIzJHqw6P/11ZMth4AUbHBWFftpQQbdLYVXh+cJS6zzfo tEfQ== X-Gm-Message-State: AOAM530/KkThzrKpga+ra4P1pI9ru8+e1Sk7D9+pB0JwddTRKXw8NB/x 38Qqrk/eIX6Fc9pggjsbiheygNzmBHoLMKeP X-Google-Smtp-Source: ABdhPJwk+WyO7L+7DmDEv6NKzv9NT0FNUGzlLjoe/puysIw3cSVvPS9bRY2rLzmA6270BRM/TeV4wg== X-Received: by 2002:a05:600c:25a:: with SMTP id 26mr14956631wmj.39.1603709906608; Mon, 26 Oct 2020 03:58:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id w83sm21165156wmg.48.2020.10.26.03.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:58:25 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v4 01/15] drm/exynos: Stop using frame_vector helpers Date: Mon, 26 Oct 2020 11:58:04 +0100 Message-Id: <20201026105818.2585306-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026105818.2585306-1-daniel.vetter@ffwll.ch> References: <20201026105818.2585306-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: linux-s390@vger.kernel.org, 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 c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHViYmFyZCA8amh1 YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5jYT4KQ2M6IElu a2kgRGFlIDxpbmtpLmRhZUBzYW1zdW5nLmNvbT4KQ2M6IEpvb255b3VuZyBTaGltIDxqeTA5MjIu c2hpbUBzYW1zdW5nLmNvbT4KQ2M6IFNldW5nLVdvbyBLaW0gPHN3MDMxMi5raW1Ac2Ftc3VuZy5j b20+CkNjOiBLeXVuZ21pbiBQYXJrIDxreXVuZ21pbi5wYXJrQHNhbXN1bmcuY29tPgpDYzogS3Vr amluIEtpbSA8a2dlbmVAa2VybmVsLm9yZz4KQ2M6IEtyenlzenRvZiBLb3psb3dza2kgPGtyemtA a2VybmVsLm9yZz4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+ CkNjOiBKb2huIEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlz c2UgPGpnbGlzc2VAcmVkaGF0LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBE YW4gV2lsbGlhbXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNr Lm9yZwpDYzogbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1z YW1zdW5nLXNvY0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9y ZwpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgot LQp2MjogVXNlIHVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayAoSm9obikKLS0tCiBkcml2ZXJz L2dwdS9kcm0vZXh5bm9zL0tjb25maWcgICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0v ZXh5bm9zL2V4eW5vc19kcm1fZzJkLmMgfCA0NyArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvS2NvbmZpZyBiL2RyaXZlcnMvZ3B1L2RybS9l eHlub3MvS2NvbmZpZwppbmRleCA2NDE3ZjM3NGI5MjMuLjQzMjU3ZWYzYzA5ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9LY29uZmlnCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9l eHlub3MvS2NvbmZpZwpAQCAtODgsNyArODgsNiBAQCBjb21tZW50ICJTdWItZHJpdmVycyIKIGNv bmZpZyBEUk1fRVhZTk9TX0cyRAogCWJvb2wgIkcyRCIKIAlkZXBlbmRzIG9uIFZJREVPX1NBTVNV TkdfUzVQX0cyRD1uIHx8IENPTVBJTEVfVEVTVAotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAloZWxw CiAJICBDaG9vc2UgdGhpcyBvcHRpb24gaWYgeW91IHdhbnQgdG8gdXNlIEV4eW5vcyBHMkQgZm9y IERSTS4KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2cy ZC5jIGIvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2cyZC5jCmluZGV4IDk2N2E1 Y2RjMTIwZS4uZWNlZGU0MWFmOWI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9z L2V4eW5vc19kcm1fZzJkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJt X2cyZC5jCkBAIC0yMDUsNyArMjA1LDggQEAgc3RydWN0IGcyZF9jbWRsaXN0X3VzZXJwdHIgewog CWRtYV9hZGRyX3QJCWRtYV9hZGRyOwogCXVuc2lnbmVkIGxvbmcJCXVzZXJwdHI7CiAJdW5zaWdu ZWQgbG9uZwkJc2l6ZTsKLQlzdHJ1Y3QgZnJhbWVfdmVjdG9yCSp2ZWM7CisJc3RydWN0IHBhZ2UJ CSoqcGFnZXM7CisJdW5zaWduZWQgaW50CQlucGFnZXM7CiAJc3RydWN0IHNnX3RhYmxlCQkqc2d0 OwogCWF0b21pY190CQlyZWZjb3VudDsKIAlib29sCQkJaW5fcG9vbDsKQEAgLTM3OCw3ICszNzks NiBAQCBzdGF0aWMgdm9pZCBnMmRfdXNlcnB0cl9wdXRfZG1hX2FkZHIoc3RydWN0IGcyZF9kYXRh ICpnMmQsCiAJCQkJCWJvb2wgZm9yY2UpCiB7CiAJc3RydWN0IGcyZF9jbWRsaXN0X3VzZXJwdHIg KmcyZF91c2VycHRyID0gb2JqOwotCXN0cnVjdCBwYWdlICoqcGFnZXM7CiAKIAlpZiAoIW9iaikK IAkJcmV0dXJuOwpAQCAtMzk4LDE1ICszOTgsOSBAQCBzdGF0aWMgdm9pZCBnMmRfdXNlcnB0cl9w dXRfZG1hX2FkZHIoc3RydWN0IGcyZF9kYXRhICpnMmQsCiAJZG1hX3VubWFwX3NndGFibGUodG9f ZG1hX2RldihnMmQtPmRybV9kZXYpLCBnMmRfdXNlcnB0ci0+c2d0LAogCQkJICBETUFfQklESVJF Q1RJT05BTCwgMCk7CiAKLQlwYWdlcyA9IGZyYW1lX3ZlY3Rvcl9wYWdlcyhnMmRfdXNlcnB0ci0+ dmVjKTsKLQlpZiAoIUlTX0VSUihwYWdlcykpIHsKLQkJaW50IGk7Ci0KLQkJZm9yIChpID0gMDsg aSA8IGZyYW1lX3ZlY3Rvcl9jb3VudChnMmRfdXNlcnB0ci0+dmVjKTsgaSsrKQotCQkJc2V0X3Bh Z2VfZGlydHlfbG9jayhwYWdlc1tpXSk7Ci0JfQotCXB1dF92YWRkcl9mcmFtZXMoZzJkX3VzZXJw dHItPnZlYyk7Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3koZzJkX3VzZXJwdHItPnZlYyk7CisJdW5w aW5fdXNlcl9wYWdlc19kaXJ0eV9sb2NrKGcyZF91c2VycHRyLT5wYWdlcywgZzJkX3VzZXJwdHIt Pm5wYWdlcywKKwkJCQkgICAgdHJ1ZSk7CisJa3ZmcmVlKGcyZF91c2VycHRyLT5wYWdlcyk7CiAK IAlpZiAoIWcyZF91c2VycHRyLT5vdXRfb2ZfbGlzdCkKIAkJbGlzdF9kZWxfaW5pdCgmZzJkX3Vz ZXJwdHItPmxpc3QpOwpAQCAtNDc0LDM1ICs0NjgsMzQgQEAgc3RhdGljIGRtYV9hZGRyX3QgKmcy ZF91c2VycHRyX2dldF9kbWFfYWRkcihzdHJ1Y3QgZzJkX2RhdGEgKmcyZCwKIAlvZmZzZXQgPSB1 c2VycHRyICYgflBBR0VfTUFTSzsKIAllbmQgPSBQQUdFX0FMSUdOKHVzZXJwdHIgKyBzaXplKTsK IAlucGFnZXMgPSAoZW5kIC0gc3RhcnQpID4+IFBBR0VfU0hJRlQ7Ci0JZzJkX3VzZXJwdHItPnZl YyA9IGZyYW1lX3ZlY3Rvcl9jcmVhdGUobnBhZ2VzKTsKLQlpZiAoIWcyZF91c2VycHRyLT52ZWMp IHsKKwlnMmRfdXNlcnB0ci0+cGFnZXMgPSBrdm1hbGxvY19hcnJheShucGFnZXMsIHNpemVvZigq ZzJkX3VzZXJwdHItPnBhZ2VzKSwKKwkJCQkJICAgIEdGUF9LRVJORUwpOworCWlmICghZzJkX3Vz ZXJwdHItPnBhZ2VzKSB7CiAJCXJldCA9IC1FTk9NRU07CiAJCWdvdG8gZXJyX2ZyZWU7CiAJfQog Ci0JcmV0ID0gZ2V0X3ZhZGRyX2ZyYW1lcyhzdGFydCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9M TF9XUklURSwKLQkJZzJkX3VzZXJwdHItPnZlYyk7CisJcmV0ID0gcGluX3VzZXJfcGFnZXNfZmFz dChzdGFydCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9MTF9XUklURSwKKwkJCQkgIGcyZF91c2Vy cHRyLT5wYWdlcyk7CiAJaWYgKHJldCAhPSBucGFnZXMpIHsKIAkJRFJNX0RFVl9FUlJPUihnMmQt PmRldiwKIAkJCSAgICAgICJmYWlsZWQgdG8gZ2V0IHVzZXIgcGFnZXMgZnJvbSB1c2VycHRyLlxu Iik7CiAJCWlmIChyZXQgPCAwKQotCQkJZ290byBlcnJfZGVzdHJveV9mcmFtZXZlYzsKLQkJcmV0 ID0gLUVGQVVMVDsKLQkJZ290byBlcnJfcHV0X2ZyYW1ldmVjOwotCX0KLQlpZiAoZnJhbWVfdmVj dG9yX3RvX3BhZ2VzKGcyZF91c2VycHRyLT52ZWMpIDwgMCkgeworCQkJZ290byBlcnJfZGVzdHJv eV9wYWdlczsKKwkJbnBhZ2VzID0gcmV0OwogCQlyZXQgPSAtRUZBVUxUOwotCQlnb3RvIGVycl9w dXRfZnJhbWV2ZWM7CisJCWdvdG8gZXJyX3VucGluX3BhZ2VzOwogCX0KKwlnMmRfdXNlcnB0ci0+ bnBhZ2VzID0gbnBhZ2VzOwogCiAJc2d0ID0ga3phbGxvYyhzaXplb2YoKnNndCksIEdGUF9LRVJO RUwpOwogCWlmICghc2d0KSB7CiAJCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gZXJyX3B1dF9mcmFt ZXZlYzsKKwkJZ290byBlcnJfdW5waW5fcGFnZXM7CiAJfQogCiAJcmV0ID0gc2dfYWxsb2NfdGFi bGVfZnJvbV9wYWdlcyhzZ3QsCi0JCQkJCWZyYW1lX3ZlY3Rvcl9wYWdlcyhnMmRfdXNlcnB0ci0+ dmVjKSwKKwkJCQkJZzJkX3VzZXJwdHItPnBhZ2VzLAogCQkJCQlucGFnZXMsIG9mZnNldCwgc2l6 ZSwgR0ZQX0tFUk5FTCk7CiAJaWYgKHJldCA8IDApIHsKIAkJRFJNX0RFVl9FUlJPUihnMmQtPmRl diwgImZhaWxlZCB0byBnZXQgc2d0IGZyb20gcGFnZXMuXG4iKTsKQEAgLTUzOCwxMSArNTMxLDEx IEBAIHN0YXRpYyBkbWFfYWRkcl90ICpnMmRfdXNlcnB0cl9nZXRfZG1hX2FkZHIoc3RydWN0IGcy ZF9kYXRhICpnMmQsCiBlcnJfZnJlZV9zZ3Q6CiAJa2ZyZWUoc2d0KTsKIAotZXJyX3B1dF9mcmFt ZXZlYzoKLQlwdXRfdmFkZHJfZnJhbWVzKGcyZF91c2VycHRyLT52ZWMpOworZXJyX3VucGluX3Bh Z2VzOgorCXVucGluX3VzZXJfcGFnZXMoZzJkX3VzZXJwdHItPnBhZ2VzLCBucGFnZXMpOwogCi1l cnJfZGVzdHJveV9mcmFtZXZlYzoKLQlmcmFtZV92ZWN0b3JfZGVzdHJveShnMmRfdXNlcnB0ci0+ dmVjKTsKK2Vycl9kZXN0cm95X3BhZ2VzOgorCWt2ZnJlZShnMmRfdXNlcnB0ci0+cGFnZXMpOwog CiBlcnJfZnJlZToKIAlrZnJlZShnMmRfdXNlcnB0cik7Ci0tIAoyLjI4LjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=