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, 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 9EC93C4741F for ; Tue, 29 Sep 2020 15:14:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5181D22207 for ; Tue, 29 Sep 2020 15:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731662AbgI2POr (ORCPT ); Tue, 29 Sep 2020 11:14:47 -0400 Received: from mx2.suse.de ([195.135.220.15]:60100 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731529AbgI2POq (ORCPT ); Tue, 29 Sep 2020 11:14:46 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 5E7F3AE64; Tue, 29 Sep 2020 15:14:44 +0000 (UTC) From: Thomas Zimmermann To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org, alexander.deucher@amd.com, christian.koenig@amd.com, kraxel@redhat.com, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, yuq825@gmail.com, bskeggs@redhat.com, robh@kernel.org, tomeu.vizoso@collabora.com, steven.price@arm.com, alyssa.rosenzweig@collabora.com, hjc@rock-chips.com, heiko@sntech.de, hdegoede@redhat.com, sean@poorly.run, eric@anholt.net, oleksandr_andrushchenko@epam.com, ray.huang@amd.com, sumit.semwal@linaro.org, emil.velikov@collabora.com, luben.tuikov@amd.com, apaneers@amd.com, linus.walleij@linaro.org, melissa.srw@gmail.com, chris@chris-wilson.co.uk, miaoqinglang@huawei.com Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, etnaviv@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, spice-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, xen-devel@lists.xenproject.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Thomas Zimmermann Subject: [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map Date: Tue, 29 Sep 2020 17:14:34 +0200 Message-Id: <20200929151437.19717-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929151437.19717-1-tzimmermann@suse.de> References: <20200929151437.19717-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org GEM's vmap and vunmap interfaces now wrap memory pointers in struct dma_buf_map. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/drm_client.c | 18 +++++++++++------- drivers/gpu/drm/drm_gem.c | 28 ++++++++++++++-------------- drivers/gpu/drm/drm_internal.h | 5 +++-- drivers/gpu/drm/drm_prime.c | 14 ++++---------- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c index 495f47d23d87..ac0082bed966 100644 --- a/drivers/gpu/drm/drm_client.c +++ b/drivers/gpu/drm/drm_client.c @@ -3,6 +3,7 @@ * Copyright 2018 Noralf Trønnes */ +#include #include #include #include @@ -304,7 +305,8 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u */ void *drm_client_buffer_vmap(struct drm_client_buffer *buffer) { - void *vaddr; + struct dma_buf_map map; + int ret; if (buffer->vaddr) return buffer->vaddr; @@ -317,13 +319,13 @@ void *drm_client_buffer_vmap(struct drm_client_buffer *buffer) * fd_install step out of the driver backend hooks, to make that * final step optional for internal users. */ - vaddr = drm_gem_vmap(buffer->gem); - if (IS_ERR(vaddr)) - return vaddr; + ret = drm_gem_vmap(buffer->gem, &map); + if (ret) + return ERR_PTR(ret); - buffer->vaddr = vaddr; + buffer->vaddr = map.vaddr; - return vaddr; + return map.vaddr; } EXPORT_SYMBOL(drm_client_buffer_vmap); @@ -337,7 +339,9 @@ EXPORT_SYMBOL(drm_client_buffer_vmap); */ void drm_client_buffer_vunmap(struct drm_client_buffer *buffer) { - drm_gem_vunmap(buffer->gem, buffer->vaddr); + struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(buffer->vaddr); + + drm_gem_vunmap(buffer->gem, &map); buffer->vaddr = NULL; } EXPORT_SYMBOL(drm_client_buffer_vunmap); diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 0c4a66dea5c2..f2b2f37d41c4 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1205,32 +1205,32 @@ void drm_gem_unpin(struct drm_gem_object *obj) obj->funcs->unpin(obj); } -void *drm_gem_vmap(struct drm_gem_object *obj) +int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map) { - struct dma_buf_map map; int ret; - if (!obj->funcs->vmap) { - return ERR_PTR(-EOPNOTSUPP); + if (!obj->funcs->vmap) + return -EOPNOTSUPP; - ret = obj->funcs->vmap(obj, &map); + ret = obj->funcs->vmap(obj, map); if (ret) - return ERR_PTR(ret); - else if (dma_buf_map_is_null(&map)) - return ERR_PTR(-ENOMEM); + return ret; + else if (dma_buf_map_is_null(map)) + return -ENOMEM; - return map.vaddr; + return 0; } -void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr) +void drm_gem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map) { - struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(vaddr); - - if (!vaddr) + if (dma_buf_map_is_null(map)) return; if (obj->funcs->vunmap) - obj->funcs->vunmap(obj, &map); + obj->funcs->vunmap(obj, map); + + /* Always set the mapping to NULL. Callers may rely on this. */ + dma_buf_map_clear(map); } /** diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index b65865c630b0..58832d75a9bd 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -33,6 +33,7 @@ struct dentry; struct dma_buf; +struct dma_buf_map; struct drm_connector; struct drm_crtc; struct drm_framebuffer; @@ -187,8 +188,8 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent, int drm_gem_pin(struct drm_gem_object *obj); void drm_gem_unpin(struct drm_gem_object *obj); -void *drm_gem_vmap(struct drm_gem_object *obj); -void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr); +int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map); +void drm_gem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map); /* drm_debugfs.c drm_debugfs_crc.c */ #if defined(CONFIG_DEBUG_FS) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 89e2a2496734..cb8fbeeb731b 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -667,21 +667,15 @@ EXPORT_SYMBOL(drm_gem_unmap_dma_buf); * * Sets up a kernel virtual mapping. This can be used as the &dma_buf_ops.vmap * callback. Calls into &drm_gem_object_funcs.vmap for device specific handling. + * The kernel virtual address is returned in map. * - * Returns the kernel virtual address or NULL on failure. + * Returns 0 on success or a negative errno code otherwise. */ int drm_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct dma_buf_map *map) { struct drm_gem_object *obj = dma_buf->priv; - void *vaddr; - vaddr = drm_gem_vmap(obj); - if (IS_ERR(vaddr)) - return PTR_ERR(vaddr); - - dma_buf_map_set_vaddr(map, vaddr); - - return 0; + return drm_gem_vmap(obj, map); } EXPORT_SYMBOL(drm_gem_dmabuf_vmap); @@ -697,7 +691,7 @@ void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, struct dma_buf_map *map) { struct drm_gem_object *obj = dma_buf->priv; - drm_gem_vunmap(obj, map->vaddr); + drm_gem_vunmap(obj, map); } EXPORT_SYMBOL(drm_gem_dmabuf_vunmap); -- 2.28.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Zimmermann Subject: [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map Date: Tue, 29 Sep 2020 17:14:34 +0200 Message-ID: <20200929151437.19717-5-tzimmermann@suse.de> References: <20200929151437.19717-1-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200929151437.19717-1-tzimmermann@suse.de> To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org, alexander.deucher@amd.com, christian.koenig@amd.com, kraxel@redhat.com, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, yuq825@gmail.com, bskeggs@redhat.com, robh@kernel.org, tomeu.vizoso@collabora.com, steven.price@arm.com, alyssa.rosenzweig@collabora.com, hjc@rock-chips.com, heiko@sntech.de, hdegoede@redhat.com, sean@poorly.run, eric@anholt.net, oleksandr_andrushchenko@epam.com, ray.huang@amd.com, sumit.semwal@linaro.org, emil.velikov@collabora.com, luben.tuikov@amd.com, apaneers@amd.com, linus.walle Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, etnaviv@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, spice-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, xen-devel@lists.xenproject.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Thomas Zimmermann List-Id: nouveau.vger.kernel.org GEM's vmap and vunmap interfaces now wrap memory pointers in struct dma_buf_map. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/drm_client.c | 18 +++++++++++------- drivers/gpu/drm/drm_gem.c | 28 ++++++++++++++-------------- drivers/gpu/drm/drm_internal.h | 5 +++-- drivers/gpu/drm/drm_prime.c | 14 ++++---------- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c index 495f47d23d87..ac0082bed966 100644 --- a/drivers/gpu/drm/drm_client.c +++ b/drivers/gpu/drm/drm_client.c @@ -3,6 +3,7 @@ * Copyright 2018 Noralf Trønnes */ +#include #include #include #include @@ -304,7 +305,8 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u */ void *drm_client_buffer_vmap(struct drm_client_buffer *buffer) { - void *vaddr; + struct dma_buf_map map; + int ret; if (buffer->vaddr) return buffer->vaddr; @@ -317,13 +319,13 @@ void *drm_client_buffer_vmap(struct drm_client_buffer *buffer) * fd_install step out of the driver backend hooks, to make that * final step optional for internal users. */ - vaddr = drm_gem_vmap(buffer->gem); - if (IS_ERR(vaddr)) - return vaddr; + ret = drm_gem_vmap(buffer->gem, &map); + if (ret) + return ERR_PTR(ret); - buffer->vaddr = vaddr; + buffer->vaddr = map.vaddr; - return vaddr; + return map.vaddr; } EXPORT_SYMBOL(drm_client_buffer_vmap); @@ -337,7 +339,9 @@ EXPORT_SYMBOL(drm_client_buffer_vmap); */ void drm_client_buffer_vunmap(struct drm_client_buffer *buffer) { - drm_gem_vunmap(buffer->gem, buffer->vaddr); + struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(buffer->vaddr); + + drm_gem_vunmap(buffer->gem, &map); buffer->vaddr = NULL; } EXPORT_SYMBOL(drm_client_buffer_vunmap); diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 0c4a66dea5c2..f2b2f37d41c4 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1205,32 +1205,32 @@ void drm_gem_unpin(struct drm_gem_object *obj) obj->funcs->unpin(obj); } -void *drm_gem_vmap(struct drm_gem_object *obj) +int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map) { - struct dma_buf_map map; int ret; - if (!obj->funcs->vmap) { - return ERR_PTR(-EOPNOTSUPP); + if (!obj->funcs->vmap) + return -EOPNOTSUPP; - ret = obj->funcs->vmap(obj, &map); + ret = obj->funcs->vmap(obj, map); if (ret) - return ERR_PTR(ret); - else if (dma_buf_map_is_null(&map)) - return ERR_PTR(-ENOMEM); + return ret; + else if (dma_buf_map_is_null(map)) + return -ENOMEM; - return map.vaddr; + return 0; } -void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr) +void drm_gem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map) { - struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(vaddr); - - if (!vaddr) + if (dma_buf_map_is_null(map)) return; if (obj->funcs->vunmap) - obj->funcs->vunmap(obj, &map); + obj->funcs->vunmap(obj, map); + + /* Always set the mapping to NULL. Callers may rely on this. */ + dma_buf_map_clear(map); } /** diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index b65865c630b0..58832d75a9bd 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -33,6 +33,7 @@ struct dentry; struct dma_buf; +struct dma_buf_map; struct drm_connector; struct drm_crtc; struct drm_framebuffer; @@ -187,8 +188,8 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent, int drm_gem_pin(struct drm_gem_object *obj); void drm_gem_unpin(struct drm_gem_object *obj); -void *drm_gem_vmap(struct drm_gem_object *obj); -void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr); +int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map); +void drm_gem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map); /* drm_debugfs.c drm_debugfs_crc.c */ #if defined(CONFIG_DEBUG_FS) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 89e2a2496734..cb8fbeeb731b 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -667,21 +667,15 @@ EXPORT_SYMBOL(drm_gem_unmap_dma_buf); * * Sets up a kernel virtual mapping. This can be used as the &dma_buf_ops.vmap * callback. Calls into &drm_gem_object_funcs.vmap for device specific handling. + * The kernel virtual address is returned in map. * - * Returns the kernel virtual address or NULL on failure. + * Returns 0 on success or a negative errno code otherwise. */ int drm_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct dma_buf_map *map) { struct drm_gem_object *obj = dma_buf->priv; - void *vaddr; - vaddr = drm_gem_vmap(obj); - if (IS_ERR(vaddr)) - return PTR_ERR(vaddr); - - dma_buf_map_set_vaddr(map, vaddr); - - return 0; + return drm_gem_vmap(obj, map); } EXPORT_SYMBOL(drm_gem_dmabuf_vmap); @@ -697,7 +691,7 @@ void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, struct dma_buf_map *map) { struct drm_gem_object *obj = dma_buf->priv; - drm_gem_vunmap(obj, map->vaddr); + drm_gem_vunmap(obj, map); } EXPORT_SYMBOL(drm_gem_dmabuf_vunmap); -- 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=-13.5 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=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 C68CFC47427 for ; Tue, 29 Sep 2020 15:15: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 59697207C4 for ; Tue, 29 Sep 2020 15:15: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="TAozC07N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59697207C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=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=lwZ1bIwZxswuzCkY+YjoHlqzwF72RCcIcdBawMiF2eA=; b=TAozC07NqACzKX9OXGnhG2txL 6tsjcQcuf3R460B8cinYH++GCOY0sOVxLWSr+wCoh7rjUWJN5v1/P/NYtWmRZ049nHZnZEfWaAnyj 32YVIL7YJMAKUpZAPem/5Hp/Ca86LuSOmqi2vMZe7KaWvJD0smKRN2DNtLzPnc6PzMezWli5A8dKu sZ64BzVYHbUjc4vsOlySWV4EMmQOINpWJWnFAktGYcPmkYu+Jrv/0jchfnme7Y0pFqWxHb3Ves+7K fJF7EEvwaF40UFmBBEiKynr8ObZxQlvbmBRtlQdmxah7XJCZxniOU8bfZu14E03xVAPo78stmkNYK 2dDVWk18Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNHLA-0000aT-TB; Tue, 29 Sep 2020 15:14:52 +0000 Received: from mx2.suse.de ([195.135.220.15]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNHL3-0000Wo-Uh; Tue, 29 Sep 2020 15:14:47 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 73CB9B11A; Tue, 29 Sep 2020 15:14:44 +0000 (UTC) From: Thomas Zimmermann To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org, alexander.deucher@amd.com, christian.koenig@amd.com, kraxel@redhat.com, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, yuq825@gmail.com, bskeggs@redhat.com, robh@kernel.org, tomeu.vizoso@collabora.com, steven.price@arm.com, alyssa.rosenzweig@collabora.com, hjc@rock-chips.com, heiko@sntech.de, hdegoede@redhat.com, sean@poorly.run, eric@anholt.net, oleksandr_andrushchenko@epam.com, ray.huang@amd.com, sumit.semwal@linaro.org, emil.velikov@collabora.com, luben.tuikov@amd.com, apaneers@amd.com, linus.walleij@linaro.org, melissa.srw@gmail.com, chris@chris-wilson.co.uk, miaoqinglang@huawei.com Subject: [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map Date: Tue, 29 Sep 2020 17:14:34 +0200 Message-Id: <20200929151437.19717-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929151437.19717-1-tzimmermann@suse.de> References: <20200929151437.19717-1-tzimmermann@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200929_111446_234968_A0E474B8 X-CRM114-Status: GOOD ( 20.68 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, etnaviv@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann , xen-devel@lists.xenproject.org, spice-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org R0VNJ3Mgdm1hcCBhbmQgdnVubWFwIGludGVyZmFjZXMgbm93IHdyYXAgbWVtb3J5IHBvaW50ZXJz IGluIHN0cnVjdApkbWFfYnVmX21hcC4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBaaW1tZXJtYW5u IDx0emltbWVybWFubkBzdXNlLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMg ICB8IDE4ICsrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyAgICAg IHwgMjggKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9p bnRlcm5hbC5oIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyAgICB8IDE0 ICsrKystLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDMzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCmluZGV4IDQ5NWY0N2QyM2Q4Ny4uYWMwMDgyYmVk OTY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fY2xpZW50LmMKQEAgLTMsNiArMyw3IEBACiAgKiBDb3B5cmlnaHQgMjAx OCBOb3JhbGYgVHLDuG5uZXMKICAqLwogCisjaW5jbHVkZSA8bGludXgvZG1hLWJ1Zi1tYXAuaD4K ICNpbmNsdWRlIDxsaW51eC9saXN0Lmg+CiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5j bHVkZSA8bGludXgvbXV0ZXguaD4KQEAgLTMwNCw3ICszMDUsOCBAQCBkcm1fY2xpZW50X2J1ZmZl cl9jcmVhdGUoc3RydWN0IGRybV9jbGllbnRfZGV2ICpjbGllbnQsIHUzMiB3aWR0aCwgdTMyIGhl aWdodCwgdQogICovCiB2b2lkICpkcm1fY2xpZW50X2J1ZmZlcl92bWFwKHN0cnVjdCBkcm1fY2xp ZW50X2J1ZmZlciAqYnVmZmVyKQogewotCXZvaWQgKnZhZGRyOworCXN0cnVjdCBkbWFfYnVmX21h cCBtYXA7CisJaW50IHJldDsKIAogCWlmIChidWZmZXItPnZhZGRyKQogCQlyZXR1cm4gYnVmZmVy LT52YWRkcjsKQEAgLTMxNywxMyArMzE5LDEzIEBAIHZvaWQgKmRybV9jbGllbnRfYnVmZmVyX3Zt YXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZmZXIpCiAJICogZmRfaW5zdGFsbCBzdGVw IG91dCBvZiB0aGUgZHJpdmVyIGJhY2tlbmQgaG9va3MsIHRvIG1ha2UgdGhhdAogCSAqIGZpbmFs IHN0ZXAgb3B0aW9uYWwgZm9yIGludGVybmFsIHVzZXJzLgogCSAqLwotCXZhZGRyID0gZHJtX2dl bV92bWFwKGJ1ZmZlci0+Z2VtKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJcmV0dXJuIHZhZGRy OworCXJldCA9IGRybV9nZW1fdm1hcChidWZmZXItPmdlbSwgJm1hcCk7CisJaWYgKHJldCkKKwkJ cmV0dXJuIEVSUl9QVFIocmV0KTsKIAotCWJ1ZmZlci0+dmFkZHIgPSB2YWRkcjsKKwlidWZmZXIt PnZhZGRyID0gbWFwLnZhZGRyOwogCi0JcmV0dXJuIHZhZGRyOworCXJldHVybiBtYXAudmFkZHI7 CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9jbGllbnRfYnVmZmVyX3ZtYXApOwogCkBAIC0zMzcsNyAr MzM5LDkgQEAgRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92bWFwKTsKICAqLwogdm9p ZCBkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZm ZXIpCiB7Ci0JZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sIGJ1ZmZlci0+dmFkZHIpOworCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXAgPSBETUFfQlVGX01BUF9JTklUX1ZBRERSKGJ1ZmZlci0+dmFk ZHIpOworCisJZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sICZtYXApOwogCWJ1ZmZlci0+dmFk ZHIgPSBOVUxMOwogfQogRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXApOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZ2VtLmMKaW5kZXggMGM0YTY2ZGVhNWMyLi5mMmIyZjM3ZDQxYzQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYwpA QCAtMTIwNSwzMiArMTIwNSwzMiBAQCB2b2lkIGRybV9nZW1fdW5waW4oc3RydWN0IGRybV9nZW1f b2JqZWN0ICpvYmopCiAJCW9iai0+ZnVuY3MtPnVucGluKG9iaik7CiB9CiAKLXZvaWQgKmRybV9n ZW1fdm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKK2ludCBkcm1fZ2VtX3ZtYXAoc3Ry dWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHN0cnVjdCBkbWFfYnVmX21hcCAqbWFwKQogewotCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXA7CiAJaW50IHJldDsKIAotCWlmICghb2JqLT5mdW5jcy0+dm1h cCkgewotCQlyZXR1cm4gRVJSX1BUUigtRU9QTk9UU1VQUCk7CisJaWYgKCFvYmotPmZ1bmNzLT52 bWFwKQorCQlyZXR1cm4gLUVPUE5PVFNVUFA7CiAKLQlyZXQgPSBvYmotPmZ1bmNzLT52bWFwKG9i aiwgJm1hcCk7CisJcmV0ID0gb2JqLT5mdW5jcy0+dm1hcChvYmosIG1hcCk7CiAJaWYgKHJldCkK LQkJcmV0dXJuIEVSUl9QVFIocmV0KTsKLQllbHNlIGlmIChkbWFfYnVmX21hcF9pc19udWxsKCZt YXApKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwkJcmV0dXJuIHJldDsKKwllbHNlIGlm IChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCisJCXJldHVybiAtRU5PTUVNOwogCi0JcmV0dXJu IG1hcC52YWRkcjsKKwlyZXR1cm4gMDsKIH0KIAotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3Qg ZHJtX2dlbV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpCit2b2lkIGRybV9nZW1fdnVubWFwKHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBzdHJ1Y3QgZG1hX2J1Zl9tYXAgKm1hcCkKIHsKLQlz dHJ1Y3QgZG1hX2J1Zl9tYXAgbWFwID0gRE1BX0JVRl9NQVBfSU5JVF9WQUREUih2YWRkcik7Ci0K LQlpZiAoIXZhZGRyKQorCWlmIChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCiAJCXJldHVybjsK IAogCWlmIChvYmotPmZ1bmNzLT52dW5tYXApCi0JCW9iai0+ZnVuY3MtPnZ1bm1hcChvYmosICZt YXApOworCQlvYmotPmZ1bmNzLT52dW5tYXAob2JqLCBtYXApOworCisJLyogQWx3YXlzIHNldCB0 aGUgbWFwcGluZyB0byBOVUxMLiBDYWxsZXJzIG1heSByZWx5IG9uIHRoaXMuICovCisJZG1hX2J1 Zl9tYXBfY2xlYXIobWFwKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2ludGVybmFsLmggYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKaW5kZXggYjY1 ODY1YzYzMGIwLi41ODgzMmQ3NWE5YmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f aW50ZXJuYWwuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKQEAgLTMzLDYg KzMzLDcgQEAKIAogc3RydWN0IGRlbnRyeTsKIHN0cnVjdCBkbWFfYnVmOworc3RydWN0IGRtYV9i dWZfbWFwOwogc3RydWN0IGRybV9jb25uZWN0b3I7CiBzdHJ1Y3QgZHJtX2NydGM7CiBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyOwpAQCAtMTg3LDggKzE4OCw4IEBAIHZvaWQgZHJtX2dlbV9wcmludF9p bmZvKHN0cnVjdCBkcm1fcHJpbnRlciAqcCwgdW5zaWduZWQgaW50IGluZGVudCwKIAogaW50IGRy bV9nZW1fcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKIHZvaWQgZHJtX2dlbV91bnBp bihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7Ci12b2lkICpkcm1fZ2VtX3ZtYXAoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmopOwotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpOworaW50IGRybV9nZW1fdm1hcChzdHJ1Y3QgZHJt X2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICptYXApOwordm9pZCBkcm1fZ2Vt X3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICpt YXApOwogCiAvKiBkcm1fZGVidWdmcy5jIGRybV9kZWJ1Z2ZzX2NyYy5jICovCiAjaWYgZGVmaW5l ZChDT05GSUdfREVCVUdfRlMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1l LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKaW5kZXggODllMmEyNDk2NzM0Li5jYjhm YmVlYjczMWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKQEAgLTY2NywyMSArNjY3LDE1IEBAIEVYUE9SVF9T WU1CT0woZHJtX2dlbV91bm1hcF9kbWFfYnVmKTsKICAqCiAgKiBTZXRzIHVwIGEga2VybmVsIHZp cnR1YWwgbWFwcGluZy4gVGhpcyBjYW4gYmUgdXNlZCBhcyB0aGUgJmRtYV9idWZfb3BzLnZtYXAK ICAqIGNhbGxiYWNrLiBDYWxscyBpbnRvICZkcm1fZ2VtX29iamVjdF9mdW5jcy52bWFwIGZvciBk ZXZpY2Ugc3BlY2lmaWMgaGFuZGxpbmcuCisgKiBUaGUga2VybmVsIHZpcnR1YWwgYWRkcmVzcyBp cyByZXR1cm5lZCBpbiBtYXAuCiAgKgotICogUmV0dXJucyB0aGUga2VybmVsIHZpcnR1YWwgYWRk cmVzcyBvciBOVUxMIG9uIGZhaWx1cmUuCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciBhIG5l Z2F0aXZlIGVycm5vIGNvZGUgb3RoZXJ3aXNlLgogICovCiBpbnQgZHJtX2dlbV9kbWFidWZfdm1h cChzdHJ1Y3QgZG1hX2J1ZiAqZG1hX2J1Ziwgc3RydWN0IGRtYV9idWZfbWFwICptYXApCiB7CiAJ c3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmogPSBkbWFfYnVmLT5wcml2OwotCXZvaWQgKnZhZGRy OwogCi0JdmFkZHIgPSBkcm1fZ2VtX3ZtYXAob2JqKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJ cmV0dXJuIFBUUl9FUlIodmFkZHIpOwotCi0JZG1hX2J1Zl9tYXBfc2V0X3ZhZGRyKG1hcCwgdmFk ZHIpOwotCi0JcmV0dXJuIDA7CisJcmV0dXJuIGRybV9nZW1fdm1hcChvYmosIG1hcCk7CiB9CiBF WFBPUlRfU1lNQk9MKGRybV9nZW1fZG1hYnVmX3ZtYXApOwogCkBAIC02OTcsNyArNjkxLDcgQEAg dm9pZCBkcm1fZ2VtX2RtYWJ1Zl92dW5tYXAoc3RydWN0IGRtYV9idWYgKmRtYV9idWYsIHN0cnVj dCBkbWFfYnVmX21hcCAqbWFwKQogewogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqID0gZG1h X2J1Zi0+cHJpdjsKIAotCWRybV9nZW1fdnVubWFwKG9iaiwgbWFwLT52YWRkcik7CisJZHJtX2dl bV92dW5tYXAob2JqLCBtYXApOwogfQogRVhQT1JUX1NZTUJPTChkcm1fZ2VtX2RtYWJ1Zl92dW5t YXApOwogCi0tIAoyLjI4LjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpMaW51eC1yb2NrY2hpcCBtYWlsaW5nIGxpc3QKTGludXgtcm9ja2NoaXBAbGlz dHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2xpbnV4LXJvY2tjaGlwCg== 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, 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 8DE71C4742E for ; Tue, 29 Sep 2020 15:15:01 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 07E3720773 for ; Tue, 29 Sep 2020 15:15:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07E3720773 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=virtualization-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3AAFB2077C; Tue, 29 Sep 2020 15:15:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CPifzYKxt230; Tue, 29 Sep 2020 15:14:54 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 3D5362075B; Tue, 29 Sep 2020 15:14:50 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 346EBC0889; Tue, 29 Sep 2020 15:14:50 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id DA46EC0051 for ; Tue, 29 Sep 2020 15:14:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C9020842A8 for ; Tue, 29 Sep 2020 15:14:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AVVZZwhevkOz for ; Tue, 29 Sep 2020 15:14:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 67725842C3 for ; Tue, 29 Sep 2020 15:14:46 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 73CB9B11A; Tue, 29 Sep 2020 15:14:44 +0000 (UTC) From: Thomas Zimmermann To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org, alexander.deucher@amd.com, christian.koenig@amd.com, kraxel@redhat.com, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, yuq825@gmail.com, bskeggs@redhat.com, robh@kernel.org, tomeu.vizoso@collabora.com, steven.price@arm.com, alyssa.rosenzweig@collabora.com, hjc@rock-chips.com, heiko@sntech.de, hdegoede@redhat.com, sean@poorly.run, eric@anholt.net, oleksandr_andrushchenko@epam.com, ray.huang@amd.com, sumit.semwal@linaro.org, emil.velikov@collabora.com, luben.tuikov@amd.com, apaneers@amd.com, linus.walleij@linaro.org, melissa.srw@gmail.com, chris@chris-wilson.co.uk, miaoqinglang@huawei.com Subject: [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map Date: Tue, 29 Sep 2020 17:14:34 +0200 Message-Id: <20200929151437.19717-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929151437.19717-1-tzimmermann@suse.de> References: <20200929151437.19717-1-tzimmermann@suse.de> MIME-Version: 1.0 Cc: linux-samsung-soc@vger.kernel.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, etnaviv@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann , xen-devel@lists.xenproject.org, spice-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" R0VNJ3Mgdm1hcCBhbmQgdnVubWFwIGludGVyZmFjZXMgbm93IHdyYXAgbWVtb3J5IHBvaW50ZXJz IGluIHN0cnVjdApkbWFfYnVmX21hcC4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBaaW1tZXJtYW5u IDx0emltbWVybWFubkBzdXNlLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMg ICB8IDE4ICsrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyAgICAg IHwgMjggKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9p bnRlcm5hbC5oIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyAgICB8IDE0 ICsrKystLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDMzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCmluZGV4IDQ5NWY0N2QyM2Q4Ny4uYWMwMDgyYmVk OTY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fY2xpZW50LmMKQEAgLTMsNiArMyw3IEBACiAgKiBDb3B5cmlnaHQgMjAx OCBOb3JhbGYgVHLDuG5uZXMKICAqLwogCisjaW5jbHVkZSA8bGludXgvZG1hLWJ1Zi1tYXAuaD4K ICNpbmNsdWRlIDxsaW51eC9saXN0Lmg+CiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5j bHVkZSA8bGludXgvbXV0ZXguaD4KQEAgLTMwNCw3ICszMDUsOCBAQCBkcm1fY2xpZW50X2J1ZmZl cl9jcmVhdGUoc3RydWN0IGRybV9jbGllbnRfZGV2ICpjbGllbnQsIHUzMiB3aWR0aCwgdTMyIGhl aWdodCwgdQogICovCiB2b2lkICpkcm1fY2xpZW50X2J1ZmZlcl92bWFwKHN0cnVjdCBkcm1fY2xp ZW50X2J1ZmZlciAqYnVmZmVyKQogewotCXZvaWQgKnZhZGRyOworCXN0cnVjdCBkbWFfYnVmX21h cCBtYXA7CisJaW50IHJldDsKIAogCWlmIChidWZmZXItPnZhZGRyKQogCQlyZXR1cm4gYnVmZmVy LT52YWRkcjsKQEAgLTMxNywxMyArMzE5LDEzIEBAIHZvaWQgKmRybV9jbGllbnRfYnVmZmVyX3Zt YXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZmZXIpCiAJICogZmRfaW5zdGFsbCBzdGVw IG91dCBvZiB0aGUgZHJpdmVyIGJhY2tlbmQgaG9va3MsIHRvIG1ha2UgdGhhdAogCSAqIGZpbmFs IHN0ZXAgb3B0aW9uYWwgZm9yIGludGVybmFsIHVzZXJzLgogCSAqLwotCXZhZGRyID0gZHJtX2dl bV92bWFwKGJ1ZmZlci0+Z2VtKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJcmV0dXJuIHZhZGRy OworCXJldCA9IGRybV9nZW1fdm1hcChidWZmZXItPmdlbSwgJm1hcCk7CisJaWYgKHJldCkKKwkJ cmV0dXJuIEVSUl9QVFIocmV0KTsKIAotCWJ1ZmZlci0+dmFkZHIgPSB2YWRkcjsKKwlidWZmZXIt PnZhZGRyID0gbWFwLnZhZGRyOwogCi0JcmV0dXJuIHZhZGRyOworCXJldHVybiBtYXAudmFkZHI7 CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9jbGllbnRfYnVmZmVyX3ZtYXApOwogCkBAIC0zMzcsNyAr MzM5LDkgQEAgRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92bWFwKTsKICAqLwogdm9p ZCBkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZm ZXIpCiB7Ci0JZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sIGJ1ZmZlci0+dmFkZHIpOworCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXAgPSBETUFfQlVGX01BUF9JTklUX1ZBRERSKGJ1ZmZlci0+dmFk ZHIpOworCisJZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sICZtYXApOwogCWJ1ZmZlci0+dmFk ZHIgPSBOVUxMOwogfQogRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXApOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZ2VtLmMKaW5kZXggMGM0YTY2ZGVhNWMyLi5mMmIyZjM3ZDQxYzQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYwpA QCAtMTIwNSwzMiArMTIwNSwzMiBAQCB2b2lkIGRybV9nZW1fdW5waW4oc3RydWN0IGRybV9nZW1f b2JqZWN0ICpvYmopCiAJCW9iai0+ZnVuY3MtPnVucGluKG9iaik7CiB9CiAKLXZvaWQgKmRybV9n ZW1fdm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKK2ludCBkcm1fZ2VtX3ZtYXAoc3Ry dWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHN0cnVjdCBkbWFfYnVmX21hcCAqbWFwKQogewotCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXA7CiAJaW50IHJldDsKIAotCWlmICghb2JqLT5mdW5jcy0+dm1h cCkgewotCQlyZXR1cm4gRVJSX1BUUigtRU9QTk9UU1VQUCk7CisJaWYgKCFvYmotPmZ1bmNzLT52 bWFwKQorCQlyZXR1cm4gLUVPUE5PVFNVUFA7CiAKLQlyZXQgPSBvYmotPmZ1bmNzLT52bWFwKG9i aiwgJm1hcCk7CisJcmV0ID0gb2JqLT5mdW5jcy0+dm1hcChvYmosIG1hcCk7CiAJaWYgKHJldCkK LQkJcmV0dXJuIEVSUl9QVFIocmV0KTsKLQllbHNlIGlmIChkbWFfYnVmX21hcF9pc19udWxsKCZt YXApKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwkJcmV0dXJuIHJldDsKKwllbHNlIGlm IChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCisJCXJldHVybiAtRU5PTUVNOwogCi0JcmV0dXJu IG1hcC52YWRkcjsKKwlyZXR1cm4gMDsKIH0KIAotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3Qg ZHJtX2dlbV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpCit2b2lkIGRybV9nZW1fdnVubWFwKHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBzdHJ1Y3QgZG1hX2J1Zl9tYXAgKm1hcCkKIHsKLQlz dHJ1Y3QgZG1hX2J1Zl9tYXAgbWFwID0gRE1BX0JVRl9NQVBfSU5JVF9WQUREUih2YWRkcik7Ci0K LQlpZiAoIXZhZGRyKQorCWlmIChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCiAJCXJldHVybjsK IAogCWlmIChvYmotPmZ1bmNzLT52dW5tYXApCi0JCW9iai0+ZnVuY3MtPnZ1bm1hcChvYmosICZt YXApOworCQlvYmotPmZ1bmNzLT52dW5tYXAob2JqLCBtYXApOworCisJLyogQWx3YXlzIHNldCB0 aGUgbWFwcGluZyB0byBOVUxMLiBDYWxsZXJzIG1heSByZWx5IG9uIHRoaXMuICovCisJZG1hX2J1 Zl9tYXBfY2xlYXIobWFwKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2ludGVybmFsLmggYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKaW5kZXggYjY1 ODY1YzYzMGIwLi41ODgzMmQ3NWE5YmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f aW50ZXJuYWwuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKQEAgLTMzLDYg KzMzLDcgQEAKIAogc3RydWN0IGRlbnRyeTsKIHN0cnVjdCBkbWFfYnVmOworc3RydWN0IGRtYV9i dWZfbWFwOwogc3RydWN0IGRybV9jb25uZWN0b3I7CiBzdHJ1Y3QgZHJtX2NydGM7CiBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyOwpAQCAtMTg3LDggKzE4OCw4IEBAIHZvaWQgZHJtX2dlbV9wcmludF9p bmZvKHN0cnVjdCBkcm1fcHJpbnRlciAqcCwgdW5zaWduZWQgaW50IGluZGVudCwKIAogaW50IGRy bV9nZW1fcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKIHZvaWQgZHJtX2dlbV91bnBp bihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7Ci12b2lkICpkcm1fZ2VtX3ZtYXAoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmopOwotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpOworaW50IGRybV9nZW1fdm1hcChzdHJ1Y3QgZHJt X2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICptYXApOwordm9pZCBkcm1fZ2Vt X3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICpt YXApOwogCiAvKiBkcm1fZGVidWdmcy5jIGRybV9kZWJ1Z2ZzX2NyYy5jICovCiAjaWYgZGVmaW5l ZChDT05GSUdfREVCVUdfRlMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1l LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKaW5kZXggODllMmEyNDk2NzM0Li5jYjhm YmVlYjczMWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKQEAgLTY2NywyMSArNjY3LDE1IEBAIEVYUE9SVF9T WU1CT0woZHJtX2dlbV91bm1hcF9kbWFfYnVmKTsKICAqCiAgKiBTZXRzIHVwIGEga2VybmVsIHZp cnR1YWwgbWFwcGluZy4gVGhpcyBjYW4gYmUgdXNlZCBhcyB0aGUgJmRtYV9idWZfb3BzLnZtYXAK ICAqIGNhbGxiYWNrLiBDYWxscyBpbnRvICZkcm1fZ2VtX29iamVjdF9mdW5jcy52bWFwIGZvciBk ZXZpY2Ugc3BlY2lmaWMgaGFuZGxpbmcuCisgKiBUaGUga2VybmVsIHZpcnR1YWwgYWRkcmVzcyBp cyByZXR1cm5lZCBpbiBtYXAuCiAgKgotICogUmV0dXJucyB0aGUga2VybmVsIHZpcnR1YWwgYWRk cmVzcyBvciBOVUxMIG9uIGZhaWx1cmUuCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciBhIG5l Z2F0aXZlIGVycm5vIGNvZGUgb3RoZXJ3aXNlLgogICovCiBpbnQgZHJtX2dlbV9kbWFidWZfdm1h cChzdHJ1Y3QgZG1hX2J1ZiAqZG1hX2J1Ziwgc3RydWN0IGRtYV9idWZfbWFwICptYXApCiB7CiAJ c3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmogPSBkbWFfYnVmLT5wcml2OwotCXZvaWQgKnZhZGRy OwogCi0JdmFkZHIgPSBkcm1fZ2VtX3ZtYXAob2JqKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJ cmV0dXJuIFBUUl9FUlIodmFkZHIpOwotCi0JZG1hX2J1Zl9tYXBfc2V0X3ZhZGRyKG1hcCwgdmFk ZHIpOwotCi0JcmV0dXJuIDA7CisJcmV0dXJuIGRybV9nZW1fdm1hcChvYmosIG1hcCk7CiB9CiBF WFBPUlRfU1lNQk9MKGRybV9nZW1fZG1hYnVmX3ZtYXApOwogCkBAIC02OTcsNyArNjkxLDcgQEAg dm9pZCBkcm1fZ2VtX2RtYWJ1Zl92dW5tYXAoc3RydWN0IGRtYV9idWYgKmRtYV9idWYsIHN0cnVj dCBkbWFfYnVmX21hcCAqbWFwKQogewogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqID0gZG1h X2J1Zi0+cHJpdjsKIAotCWRybV9nZW1fdnVubWFwKG9iaiwgbWFwLT52YWRkcik7CisJZHJtX2dl bV92dW5tYXAob2JqLCBtYXApOwogfQogRVhQT1JUX1NZTUJPTChkcm1fZ2VtX2RtYWJ1Zl92dW5t YXApOwogCi0tIAoyLjI4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClZpcnR1YWxpemF0aW9uIG1haWxpbmcgbGlzdApWaXJ0dWFsaXphdGlvbkBsaXN0 cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4Zm91bmRhdGlvbi5vcmcv bWFpbG1hbi9saXN0aW5mby92aXJ0dWFsaXphdGlvbg== 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, 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 44B78C4742A for ; Tue, 29 Sep 2020 15:15:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D774120773 for ; Tue, 29 Sep 2020 15:15:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D774120773 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de 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 2689E6E3DA; Tue, 29 Sep 2020 15:14:55 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4348F6E202; Tue, 29 Sep 2020 15:14:46 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 73CB9B11A; Tue, 29 Sep 2020 15:14:44 +0000 (UTC) From: Thomas Zimmermann To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org, alexander.deucher@amd.com, christian.koenig@amd.com, kraxel@redhat.com, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, yuq825@gmail.com, bskeggs@redhat.com, robh@kernel.org, tomeu.vizoso@collabora.com, steven.price@arm.com, alyssa.rosenzweig@collabora.com, hjc@rock-chips.com, heiko@sntech.de, hdegoede@redhat.com, sean@poorly.run, eric@anholt.net, oleksandr_andrushchenko@epam.com, ray.huang@amd.com, sumit.semwal@linaro.org, emil.velikov@collabora.com, luben.tuikov@amd.com, apaneers@amd.com, linus.walleij@linaro.org, melissa.srw@gmail.com, chris@chris-wilson.co.uk, miaoqinglang@huawei.com Subject: [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map Date: Tue, 29 Sep 2020 17:14:34 +0200 Message-Id: <20200929151437.19717-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929151437.19717-1-tzimmermann@suse.de> References: <20200929151437.19717-1-tzimmermann@suse.de> 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-samsung-soc@vger.kernel.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, etnaviv@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann , xen-devel@lists.xenproject.org, spice-devel@lists.freedesktop.org, 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" R0VNJ3Mgdm1hcCBhbmQgdnVubWFwIGludGVyZmFjZXMgbm93IHdyYXAgbWVtb3J5IHBvaW50ZXJz IGluIHN0cnVjdApkbWFfYnVmX21hcC4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBaaW1tZXJtYW5u IDx0emltbWVybWFubkBzdXNlLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMg ICB8IDE4ICsrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyAgICAg IHwgMjggKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9p bnRlcm5hbC5oIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyAgICB8IDE0 ICsrKystLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDMzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCmluZGV4IDQ5NWY0N2QyM2Q4Ny4uYWMwMDgyYmVk OTY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fY2xpZW50LmMKQEAgLTMsNiArMyw3IEBACiAgKiBDb3B5cmlnaHQgMjAx OCBOb3JhbGYgVHLDuG5uZXMKICAqLwogCisjaW5jbHVkZSA8bGludXgvZG1hLWJ1Zi1tYXAuaD4K ICNpbmNsdWRlIDxsaW51eC9saXN0Lmg+CiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5j bHVkZSA8bGludXgvbXV0ZXguaD4KQEAgLTMwNCw3ICszMDUsOCBAQCBkcm1fY2xpZW50X2J1ZmZl cl9jcmVhdGUoc3RydWN0IGRybV9jbGllbnRfZGV2ICpjbGllbnQsIHUzMiB3aWR0aCwgdTMyIGhl aWdodCwgdQogICovCiB2b2lkICpkcm1fY2xpZW50X2J1ZmZlcl92bWFwKHN0cnVjdCBkcm1fY2xp ZW50X2J1ZmZlciAqYnVmZmVyKQogewotCXZvaWQgKnZhZGRyOworCXN0cnVjdCBkbWFfYnVmX21h cCBtYXA7CisJaW50IHJldDsKIAogCWlmIChidWZmZXItPnZhZGRyKQogCQlyZXR1cm4gYnVmZmVy LT52YWRkcjsKQEAgLTMxNywxMyArMzE5LDEzIEBAIHZvaWQgKmRybV9jbGllbnRfYnVmZmVyX3Zt YXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZmZXIpCiAJICogZmRfaW5zdGFsbCBzdGVw IG91dCBvZiB0aGUgZHJpdmVyIGJhY2tlbmQgaG9va3MsIHRvIG1ha2UgdGhhdAogCSAqIGZpbmFs IHN0ZXAgb3B0aW9uYWwgZm9yIGludGVybmFsIHVzZXJzLgogCSAqLwotCXZhZGRyID0gZHJtX2dl bV92bWFwKGJ1ZmZlci0+Z2VtKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJcmV0dXJuIHZhZGRy OworCXJldCA9IGRybV9nZW1fdm1hcChidWZmZXItPmdlbSwgJm1hcCk7CisJaWYgKHJldCkKKwkJ cmV0dXJuIEVSUl9QVFIocmV0KTsKIAotCWJ1ZmZlci0+dmFkZHIgPSB2YWRkcjsKKwlidWZmZXIt PnZhZGRyID0gbWFwLnZhZGRyOwogCi0JcmV0dXJuIHZhZGRyOworCXJldHVybiBtYXAudmFkZHI7 CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9jbGllbnRfYnVmZmVyX3ZtYXApOwogCkBAIC0zMzcsNyAr MzM5LDkgQEAgRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92bWFwKTsKICAqLwogdm9p ZCBkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZm ZXIpCiB7Ci0JZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sIGJ1ZmZlci0+dmFkZHIpOworCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXAgPSBETUFfQlVGX01BUF9JTklUX1ZBRERSKGJ1ZmZlci0+dmFk ZHIpOworCisJZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sICZtYXApOwogCWJ1ZmZlci0+dmFk ZHIgPSBOVUxMOwogfQogRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXApOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZ2VtLmMKaW5kZXggMGM0YTY2ZGVhNWMyLi5mMmIyZjM3ZDQxYzQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYwpA QCAtMTIwNSwzMiArMTIwNSwzMiBAQCB2b2lkIGRybV9nZW1fdW5waW4oc3RydWN0IGRybV9nZW1f b2JqZWN0ICpvYmopCiAJCW9iai0+ZnVuY3MtPnVucGluKG9iaik7CiB9CiAKLXZvaWQgKmRybV9n ZW1fdm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKK2ludCBkcm1fZ2VtX3ZtYXAoc3Ry dWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHN0cnVjdCBkbWFfYnVmX21hcCAqbWFwKQogewotCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXA7CiAJaW50IHJldDsKIAotCWlmICghb2JqLT5mdW5jcy0+dm1h cCkgewotCQlyZXR1cm4gRVJSX1BUUigtRU9QTk9UU1VQUCk7CisJaWYgKCFvYmotPmZ1bmNzLT52 bWFwKQorCQlyZXR1cm4gLUVPUE5PVFNVUFA7CiAKLQlyZXQgPSBvYmotPmZ1bmNzLT52bWFwKG9i aiwgJm1hcCk7CisJcmV0ID0gb2JqLT5mdW5jcy0+dm1hcChvYmosIG1hcCk7CiAJaWYgKHJldCkK LQkJcmV0dXJuIEVSUl9QVFIocmV0KTsKLQllbHNlIGlmIChkbWFfYnVmX21hcF9pc19udWxsKCZt YXApKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwkJcmV0dXJuIHJldDsKKwllbHNlIGlm IChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCisJCXJldHVybiAtRU5PTUVNOwogCi0JcmV0dXJu IG1hcC52YWRkcjsKKwlyZXR1cm4gMDsKIH0KIAotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3Qg ZHJtX2dlbV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpCit2b2lkIGRybV9nZW1fdnVubWFwKHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBzdHJ1Y3QgZG1hX2J1Zl9tYXAgKm1hcCkKIHsKLQlz dHJ1Y3QgZG1hX2J1Zl9tYXAgbWFwID0gRE1BX0JVRl9NQVBfSU5JVF9WQUREUih2YWRkcik7Ci0K LQlpZiAoIXZhZGRyKQorCWlmIChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCiAJCXJldHVybjsK IAogCWlmIChvYmotPmZ1bmNzLT52dW5tYXApCi0JCW9iai0+ZnVuY3MtPnZ1bm1hcChvYmosICZt YXApOworCQlvYmotPmZ1bmNzLT52dW5tYXAob2JqLCBtYXApOworCisJLyogQWx3YXlzIHNldCB0 aGUgbWFwcGluZyB0byBOVUxMLiBDYWxsZXJzIG1heSByZWx5IG9uIHRoaXMuICovCisJZG1hX2J1 Zl9tYXBfY2xlYXIobWFwKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2ludGVybmFsLmggYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKaW5kZXggYjY1 ODY1YzYzMGIwLi41ODgzMmQ3NWE5YmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f aW50ZXJuYWwuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKQEAgLTMzLDYg KzMzLDcgQEAKIAogc3RydWN0IGRlbnRyeTsKIHN0cnVjdCBkbWFfYnVmOworc3RydWN0IGRtYV9i dWZfbWFwOwogc3RydWN0IGRybV9jb25uZWN0b3I7CiBzdHJ1Y3QgZHJtX2NydGM7CiBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyOwpAQCAtMTg3LDggKzE4OCw4IEBAIHZvaWQgZHJtX2dlbV9wcmludF9p bmZvKHN0cnVjdCBkcm1fcHJpbnRlciAqcCwgdW5zaWduZWQgaW50IGluZGVudCwKIAogaW50IGRy bV9nZW1fcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKIHZvaWQgZHJtX2dlbV91bnBp bihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7Ci12b2lkICpkcm1fZ2VtX3ZtYXAoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmopOwotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpOworaW50IGRybV9nZW1fdm1hcChzdHJ1Y3QgZHJt X2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICptYXApOwordm9pZCBkcm1fZ2Vt X3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICpt YXApOwogCiAvKiBkcm1fZGVidWdmcy5jIGRybV9kZWJ1Z2ZzX2NyYy5jICovCiAjaWYgZGVmaW5l ZChDT05GSUdfREVCVUdfRlMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1l LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKaW5kZXggODllMmEyNDk2NzM0Li5jYjhm YmVlYjczMWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKQEAgLTY2NywyMSArNjY3LDE1IEBAIEVYUE9SVF9T WU1CT0woZHJtX2dlbV91bm1hcF9kbWFfYnVmKTsKICAqCiAgKiBTZXRzIHVwIGEga2VybmVsIHZp cnR1YWwgbWFwcGluZy4gVGhpcyBjYW4gYmUgdXNlZCBhcyB0aGUgJmRtYV9idWZfb3BzLnZtYXAK ICAqIGNhbGxiYWNrLiBDYWxscyBpbnRvICZkcm1fZ2VtX29iamVjdF9mdW5jcy52bWFwIGZvciBk ZXZpY2Ugc3BlY2lmaWMgaGFuZGxpbmcuCisgKiBUaGUga2VybmVsIHZpcnR1YWwgYWRkcmVzcyBp cyByZXR1cm5lZCBpbiBtYXAuCiAgKgotICogUmV0dXJucyB0aGUga2VybmVsIHZpcnR1YWwgYWRk cmVzcyBvciBOVUxMIG9uIGZhaWx1cmUuCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciBhIG5l Z2F0aXZlIGVycm5vIGNvZGUgb3RoZXJ3aXNlLgogICovCiBpbnQgZHJtX2dlbV9kbWFidWZfdm1h cChzdHJ1Y3QgZG1hX2J1ZiAqZG1hX2J1Ziwgc3RydWN0IGRtYV9idWZfbWFwICptYXApCiB7CiAJ c3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmogPSBkbWFfYnVmLT5wcml2OwotCXZvaWQgKnZhZGRy OwogCi0JdmFkZHIgPSBkcm1fZ2VtX3ZtYXAob2JqKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJ cmV0dXJuIFBUUl9FUlIodmFkZHIpOwotCi0JZG1hX2J1Zl9tYXBfc2V0X3ZhZGRyKG1hcCwgdmFk ZHIpOwotCi0JcmV0dXJuIDA7CisJcmV0dXJuIGRybV9nZW1fdm1hcChvYmosIG1hcCk7CiB9CiBF WFBPUlRfU1lNQk9MKGRybV9nZW1fZG1hYnVmX3ZtYXApOwogCkBAIC02OTcsNyArNjkxLDcgQEAg dm9pZCBkcm1fZ2VtX2RtYWJ1Zl92dW5tYXAoc3RydWN0IGRtYV9idWYgKmRtYV9idWYsIHN0cnVj dCBkbWFfYnVmX21hcCAqbWFwKQogewogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqID0gZG1h X2J1Zi0+cHJpdjsKIAotCWRybV9nZW1fdnVubWFwKG9iaiwgbWFwLT52YWRkcik7CisJZHJtX2dl bV92dW5tYXAob2JqLCBtYXApOwogfQogRVhQT1JUX1NZTUJPTChkcm1fZ2VtX2RtYWJ1Zl92dW5t YXApOwogCi0tIAoyLjI4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo= 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, 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 AFEB4C4742E for ; Tue, 29 Sep 2020 15:15:14 +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 5A5FA20789 for ; Tue, 29 Sep 2020 15:15:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A5FA20789 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 98D796E40B; Tue, 29 Sep 2020 15:15:00 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4348F6E202; Tue, 29 Sep 2020 15:14:46 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 73CB9B11A; Tue, 29 Sep 2020 15:14:44 +0000 (UTC) From: Thomas Zimmermann To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org, alexander.deucher@amd.com, christian.koenig@amd.com, kraxel@redhat.com, l.stach@pengutronix.de, linux+etnaviv@armlinux.org.uk, christian.gmeiner@gmail.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, yuq825@gmail.com, bskeggs@redhat.com, robh@kernel.org, tomeu.vizoso@collabora.com, steven.price@arm.com, alyssa.rosenzweig@collabora.com, hjc@rock-chips.com, heiko@sntech.de, hdegoede@redhat.com, sean@poorly.run, eric@anholt.net, oleksandr_andrushchenko@epam.com, ray.huang@amd.com, sumit.semwal@linaro.org, emil.velikov@collabora.com, luben.tuikov@amd.com, apaneers@amd.com, linus.walleij@linaro.org, melissa.srw@gmail.com, chris@chris-wilson.co.uk, miaoqinglang@huawei.com Subject: [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map Date: Tue, 29 Sep 2020 17:14:34 +0200 Message-Id: <20200929151437.19717-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929151437.19717-1-tzimmermann@suse.de> References: <20200929151437.19717-1-tzimmermann@suse.de> MIME-Version: 1.0 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, lima@lists.freedesktop.org, nouveau@lists.freedesktop.org, etnaviv@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann , xen-devel@lists.xenproject.org, spice-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" R0VNJ3Mgdm1hcCBhbmQgdnVubWFwIGludGVyZmFjZXMgbm93IHdyYXAgbWVtb3J5IHBvaW50ZXJz IGluIHN0cnVjdApkbWFfYnVmX21hcC4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBaaW1tZXJtYW5u IDx0emltbWVybWFubkBzdXNlLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMg ICB8IDE4ICsrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyAgICAg IHwgMjggKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9p bnRlcm5hbC5oIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyAgICB8IDE0 ICsrKystLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDMzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY2xpZW50LmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCmluZGV4IDQ5NWY0N2QyM2Q4Ny4uYWMwMDgyYmVk OTY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NsaWVudC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fY2xpZW50LmMKQEAgLTMsNiArMyw3IEBACiAgKiBDb3B5cmlnaHQgMjAx OCBOb3JhbGYgVHLDuG5uZXMKICAqLwogCisjaW5jbHVkZSA8bGludXgvZG1hLWJ1Zi1tYXAuaD4K ICNpbmNsdWRlIDxsaW51eC9saXN0Lmg+CiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5j bHVkZSA8bGludXgvbXV0ZXguaD4KQEAgLTMwNCw3ICszMDUsOCBAQCBkcm1fY2xpZW50X2J1ZmZl cl9jcmVhdGUoc3RydWN0IGRybV9jbGllbnRfZGV2ICpjbGllbnQsIHUzMiB3aWR0aCwgdTMyIGhl aWdodCwgdQogICovCiB2b2lkICpkcm1fY2xpZW50X2J1ZmZlcl92bWFwKHN0cnVjdCBkcm1fY2xp ZW50X2J1ZmZlciAqYnVmZmVyKQogewotCXZvaWQgKnZhZGRyOworCXN0cnVjdCBkbWFfYnVmX21h cCBtYXA7CisJaW50IHJldDsKIAogCWlmIChidWZmZXItPnZhZGRyKQogCQlyZXR1cm4gYnVmZmVy LT52YWRkcjsKQEAgLTMxNywxMyArMzE5LDEzIEBAIHZvaWQgKmRybV9jbGllbnRfYnVmZmVyX3Zt YXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZmZXIpCiAJICogZmRfaW5zdGFsbCBzdGVw IG91dCBvZiB0aGUgZHJpdmVyIGJhY2tlbmQgaG9va3MsIHRvIG1ha2UgdGhhdAogCSAqIGZpbmFs IHN0ZXAgb3B0aW9uYWwgZm9yIGludGVybmFsIHVzZXJzLgogCSAqLwotCXZhZGRyID0gZHJtX2dl bV92bWFwKGJ1ZmZlci0+Z2VtKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJcmV0dXJuIHZhZGRy OworCXJldCA9IGRybV9nZW1fdm1hcChidWZmZXItPmdlbSwgJm1hcCk7CisJaWYgKHJldCkKKwkJ cmV0dXJuIEVSUl9QVFIocmV0KTsKIAotCWJ1ZmZlci0+dmFkZHIgPSB2YWRkcjsKKwlidWZmZXIt PnZhZGRyID0gbWFwLnZhZGRyOwogCi0JcmV0dXJuIHZhZGRyOworCXJldHVybiBtYXAudmFkZHI7 CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9jbGllbnRfYnVmZmVyX3ZtYXApOwogCkBAIC0zMzcsNyAr MzM5LDkgQEAgRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92bWFwKTsKICAqLwogdm9p ZCBkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXAoc3RydWN0IGRybV9jbGllbnRfYnVmZmVyICpidWZm ZXIpCiB7Ci0JZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sIGJ1ZmZlci0+dmFkZHIpOworCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXAgPSBETUFfQlVGX01BUF9JTklUX1ZBRERSKGJ1ZmZlci0+dmFk ZHIpOworCisJZHJtX2dlbV92dW5tYXAoYnVmZmVyLT5nZW0sICZtYXApOwogCWJ1ZmZlci0+dmFk ZHIgPSBOVUxMOwogfQogRVhQT1JUX1NZTUJPTChkcm1fY2xpZW50X2J1ZmZlcl92dW5tYXApOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZ2VtLmMKaW5kZXggMGM0YTY2ZGVhNWMyLi5mMmIyZjM3ZDQxYzQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYwpA QCAtMTIwNSwzMiArMTIwNSwzMiBAQCB2b2lkIGRybV9nZW1fdW5waW4oc3RydWN0IGRybV9nZW1f b2JqZWN0ICpvYmopCiAJCW9iai0+ZnVuY3MtPnVucGluKG9iaik7CiB9CiAKLXZvaWQgKmRybV9n ZW1fdm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKK2ludCBkcm1fZ2VtX3ZtYXAoc3Ry dWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIHN0cnVjdCBkbWFfYnVmX21hcCAqbWFwKQogewotCXN0 cnVjdCBkbWFfYnVmX21hcCBtYXA7CiAJaW50IHJldDsKIAotCWlmICghb2JqLT5mdW5jcy0+dm1h cCkgewotCQlyZXR1cm4gRVJSX1BUUigtRU9QTk9UU1VQUCk7CisJaWYgKCFvYmotPmZ1bmNzLT52 bWFwKQorCQlyZXR1cm4gLUVPUE5PVFNVUFA7CiAKLQlyZXQgPSBvYmotPmZ1bmNzLT52bWFwKG9i aiwgJm1hcCk7CisJcmV0ID0gb2JqLT5mdW5jcy0+dm1hcChvYmosIG1hcCk7CiAJaWYgKHJldCkK LQkJcmV0dXJuIEVSUl9QVFIocmV0KTsKLQllbHNlIGlmIChkbWFfYnVmX21hcF9pc19udWxsKCZt YXApKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKKwkJcmV0dXJuIHJldDsKKwllbHNlIGlm IChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCisJCXJldHVybiAtRU5PTUVNOwogCi0JcmV0dXJu IG1hcC52YWRkcjsKKwlyZXR1cm4gMDsKIH0KIAotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3Qg ZHJtX2dlbV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpCit2b2lkIGRybV9nZW1fdnVubWFwKHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBzdHJ1Y3QgZG1hX2J1Zl9tYXAgKm1hcCkKIHsKLQlz dHJ1Y3QgZG1hX2J1Zl9tYXAgbWFwID0gRE1BX0JVRl9NQVBfSU5JVF9WQUREUih2YWRkcik7Ci0K LQlpZiAoIXZhZGRyKQorCWlmIChkbWFfYnVmX21hcF9pc19udWxsKG1hcCkpCiAJCXJldHVybjsK IAogCWlmIChvYmotPmZ1bmNzLT52dW5tYXApCi0JCW9iai0+ZnVuY3MtPnZ1bm1hcChvYmosICZt YXApOworCQlvYmotPmZ1bmNzLT52dW5tYXAob2JqLCBtYXApOworCisJLyogQWx3YXlzIHNldCB0 aGUgbWFwcGluZyB0byBOVUxMLiBDYWxsZXJzIG1heSByZWx5IG9uIHRoaXMuICovCisJZG1hX2J1 Zl9tYXBfY2xlYXIobWFwKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2ludGVybmFsLmggYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKaW5kZXggYjY1 ODY1YzYzMGIwLi41ODgzMmQ3NWE5YmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f aW50ZXJuYWwuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ludGVybmFsLmgKQEAgLTMzLDYg KzMzLDcgQEAKIAogc3RydWN0IGRlbnRyeTsKIHN0cnVjdCBkbWFfYnVmOworc3RydWN0IGRtYV9i dWZfbWFwOwogc3RydWN0IGRybV9jb25uZWN0b3I7CiBzdHJ1Y3QgZHJtX2NydGM7CiBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyOwpAQCAtMTg3LDggKzE4OCw4IEBAIHZvaWQgZHJtX2dlbV9wcmludF9p bmZvKHN0cnVjdCBkcm1fcHJpbnRlciAqcCwgdW5zaWduZWQgaW50IGluZGVudCwKIAogaW50IGRy bV9nZW1fcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKIHZvaWQgZHJtX2dlbV91bnBp bihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7Ci12b2lkICpkcm1fZ2VtX3ZtYXAoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmopOwotdm9pZCBkcm1fZ2VtX3Z1bm1hcChzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKm9iaiwgdm9pZCAqdmFkZHIpOworaW50IGRybV9nZW1fdm1hcChzdHJ1Y3QgZHJt X2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICptYXApOwordm9pZCBkcm1fZ2Vt X3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRtYV9idWZfbWFwICpt YXApOwogCiAvKiBkcm1fZGVidWdmcy5jIGRybV9kZWJ1Z2ZzX2NyYy5jICovCiAjaWYgZGVmaW5l ZChDT05GSUdfREVCVUdfRlMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1l LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKaW5kZXggODllMmEyNDk2NzM0Li5jYjhm YmVlYjczMWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX3ByaW1lLmMKQEAgLTY2NywyMSArNjY3LDE1IEBAIEVYUE9SVF9T WU1CT0woZHJtX2dlbV91bm1hcF9kbWFfYnVmKTsKICAqCiAgKiBTZXRzIHVwIGEga2VybmVsIHZp cnR1YWwgbWFwcGluZy4gVGhpcyBjYW4gYmUgdXNlZCBhcyB0aGUgJmRtYV9idWZfb3BzLnZtYXAK ICAqIGNhbGxiYWNrLiBDYWxscyBpbnRvICZkcm1fZ2VtX29iamVjdF9mdW5jcy52bWFwIGZvciBk ZXZpY2Ugc3BlY2lmaWMgaGFuZGxpbmcuCisgKiBUaGUga2VybmVsIHZpcnR1YWwgYWRkcmVzcyBp cyByZXR1cm5lZCBpbiBtYXAuCiAgKgotICogUmV0dXJucyB0aGUga2VybmVsIHZpcnR1YWwgYWRk cmVzcyBvciBOVUxMIG9uIGZhaWx1cmUuCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcyBvciBhIG5l Z2F0aXZlIGVycm5vIGNvZGUgb3RoZXJ3aXNlLgogICovCiBpbnQgZHJtX2dlbV9kbWFidWZfdm1h cChzdHJ1Y3QgZG1hX2J1ZiAqZG1hX2J1Ziwgc3RydWN0IGRtYV9idWZfbWFwICptYXApCiB7CiAJ c3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmogPSBkbWFfYnVmLT5wcml2OwotCXZvaWQgKnZhZGRy OwogCi0JdmFkZHIgPSBkcm1fZ2VtX3ZtYXAob2JqKTsKLQlpZiAoSVNfRVJSKHZhZGRyKSkKLQkJ cmV0dXJuIFBUUl9FUlIodmFkZHIpOwotCi0JZG1hX2J1Zl9tYXBfc2V0X3ZhZGRyKG1hcCwgdmFk ZHIpOwotCi0JcmV0dXJuIDA7CisJcmV0dXJuIGRybV9nZW1fdm1hcChvYmosIG1hcCk7CiB9CiBF WFBPUlRfU1lNQk9MKGRybV9nZW1fZG1hYnVmX3ZtYXApOwogCkBAIC02OTcsNyArNjkxLDcgQEAg dm9pZCBkcm1fZ2VtX2RtYWJ1Zl92dW5tYXAoc3RydWN0IGRtYV9idWYgKmRtYV9idWYsIHN0cnVj dCBkbWFfYnVmX21hcCAqbWFwKQogewogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqID0gZG1h X2J1Zi0+cHJpdjsKIAotCWRybV9nZW1fdnVubWFwKG9iaiwgbWFwLT52YWRkcik7CisJZHJtX2dl bV92dW5tYXAob2JqLCBtYXApOwogfQogRVhQT1JUX1NZTUJPTChkcm1fZ2VtX2RtYWJ1Zl92dW5t YXApOwogCi0tIAoyLjI4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=