From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 15246C34051 for ; Wed, 19 Feb 2020 12:59:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE7EC20801 for ; Wed, 19 Feb 2020 12:59:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="giRn9oVt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727495AbgBSM7T (ORCPT ); Wed, 19 Feb 2020 07:59:19 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44599 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726786AbgBSM7S (ORCPT ); Wed, 19 Feb 2020 07:59:18 -0500 Received: by mail-wr1-f66.google.com with SMTP id m16so374813wrx.11 for ; Wed, 19 Feb 2020 04:59:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hCeM9CJ6pzmi1o3KK+XpvWx7SxeTxw84lBGmVzLUTd8=; b=giRn9oVt2bLLBetMmwF1HDSw7QygLii+yESQB5yyQvHBoCUPNuhnnuCcO40866mAXl ZgzznsO+vKrBC+IcmIylWWYdRBFFIzr4HwBm1qyHfGjl8qFfWwtb3M+N4FT7V8mYFFcH NsI8ko5OmvLIaTfedhhSSDd1gQwJfwjRocqOg3wWBgKFcQykt78LG7Sn52D3XGKIPlNK tl11S5HhDJ2Gt7ZZrcMAJsDWjTh8UK7MGGlawsYsxffHGrX9LQwjthDrlY6FdXK5q6gh Sht+o8y9KkbLvmRyk348Ter9+EWz62i6Vx0g1R+1qwJH8foAUktVPR3WhQK6Yzyr4LLo s4/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hCeM9CJ6pzmi1o3KK+XpvWx7SxeTxw84lBGmVzLUTd8=; b=F7I3kgAfdarwvPK/FhIR8e9Iu1AJU8sgWgICO155SvmPXeBa8e5575TIsuhMWO878L UBor4kkqX4Q13/qzaCBbHTPw4OszpDHQLQRANHSUzyzOikXjjEoN1GdthYEzzSzOTQ5y 2eMu6b1JA9zJBnnAKcFo7Z0J8UDWIS5AEMKiRxrqFyWU6hI2ZOMowZ/1KkPh1wBIANLE 4oIX4Sajz76/QbnlhHQqyuCWnWAyMlB7DMsrzx3R8ojSmjA81u6iNfC3KgQlh8YoOTY5 PbLOJvTTowUfL08nF50lIAr7MAOAzO6FstjRwSeFdk3VcCiRQwwTkztW6E8lBHXITlmN 7okw== X-Gm-Message-State: APjAAAUA0A1tbs9azAVoRY8xKbkroYGiSCV3areaLxImZif/3NB0kxYr mG5rCeJwgTpeprDb0pqZK5Q= X-Google-Smtp-Source: APXvYqySOgedUHE0WIseUqC6YRH4GURoV+8ztV20bSWnbuN2/ag6oz0YQs44nziyGSFcOqFV5ziYRA== X-Received: by 2002:adf:dfcc:: with SMTP id q12mr35180842wrn.171.1582117156160; Wed, 19 Feb 2020 04:59:16 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:90ea:9d7:18a3:895e]) by smtp.gmail.com with ESMTPSA id h2sm3079024wrt.45.2020.02.19.04.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 04:59:15 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, daniel@ffwll.ch Subject: [PATCH 6/7] dma-buf: drop dynamic_mapping flag Date: Wed, 19 Feb 2020 13:59:09 +0100 Message-Id: <20200219125910.89147-6-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200219125910.89147-1-christian.koenig@amd.com> References: <20200219125910.89147-1-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Instead use the pin() callback to detect dynamic DMA-buf handling. Since amdgpu is now migrated it doesn't make much sense to keep the extra flag. Signed-off-by: Christian König --- drivers/dma-buf/dma-buf.c | 5 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 - include/linux/dma-buf.h | 21 +++++---------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 5f10d1929476..6d0a82d1b23d 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -524,11 +524,10 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) } if (WARN_ON(exp_info->ops->cache_sgt_mapping && - exp_info->ops->dynamic_mapping)) + (exp_info->ops->pin || exp_info->ops->unpin))) return ERR_PTR(-EINVAL); - if (WARN_ON(!exp_info->ops->dynamic_mapping && - (exp_info->ops->pin || exp_info->ops->unpin))) + if (WARN_ON(!exp_info->ops->pin != !exp_info->ops->unpin)) return ERR_PTR(-EINVAL); if (!try_module_get(exp_info->owner)) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c index 1a040ccf61bf..ffeb20f11c07 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c @@ -364,7 +364,6 @@ static int amdgpu_dma_buf_begin_cpu_access(struct dma_buf *dma_buf, } const struct dma_buf_ops amdgpu_dmabuf_ops = { - .dynamic_mapping = true, .attach = amdgpu_dma_buf_attach, .detach = amdgpu_dma_buf_detach, .pin = amdgpu_dma_buf_pin, diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index b38cea240b67..1ade486fc2bb 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -42,18 +42,6 @@ struct dma_buf_ops { */ bool cache_sgt_mapping; - /** - * @dynamic_mapping: - * - * If true the framework makes sure that the map/unmap_dma_buf - * callbacks are always called with the dma_resv object locked. - * - * If false the framework makes sure that the map/unmap_dma_buf - * callbacks are always called without the dma_resv object locked. - * Mutual exclusive with @cache_sgt_mapping. - */ - bool dynamic_mapping; - /** * @attach: * @@ -99,7 +87,8 @@ struct dma_buf_ops { * This is called by dma_buf_pin and lets the exporter know that the * DMA-buf can't be moved any more. * - * This is called with the dmabuf->resv object locked. + * This is called with the dmabuf->resv object locked and is mutual + * exclusive with @cache_sgt_mapping. * * This callback is optional and should only be used in limited use * cases like scanout and not for temporary pin operations. @@ -116,7 +105,8 @@ struct dma_buf_ops { * This is called by dma_buf_unpin and lets the exporter know that the * DMA-buf can be moved again. * - * This is called with the dmabuf->resv object locked. + * This is called with the dmabuf->resv object locked and is mutual + * exclusive with @cache_sgt_mapping. * * This callback is optional. */ @@ -455,8 +445,7 @@ static inline void get_dma_buf(struct dma_buf *dmabuf) */ static inline bool dma_buf_is_dynamic(struct dma_buf *dmabuf) { - /* TODO: switch to using pin/unpin functions as indicator. */ - return dmabuf->ops->dynamic_mapping; + return !!dmabuf->ops->pin; } /** -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 23232C3404D for ; Wed, 19 Feb 2020 12:59:29 +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 EEA2220801 for ; Wed, 19 Feb 2020 12:59:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="giRn9oVt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEA2220801 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB6E66EBCA; Wed, 19 Feb 2020 12:59:20 +0000 (UTC) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6AF26E5B2; Wed, 19 Feb 2020 12:59:17 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id z3so441206wru.3; Wed, 19 Feb 2020 04:59:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hCeM9CJ6pzmi1o3KK+XpvWx7SxeTxw84lBGmVzLUTd8=; b=giRn9oVt2bLLBetMmwF1HDSw7QygLii+yESQB5yyQvHBoCUPNuhnnuCcO40866mAXl ZgzznsO+vKrBC+IcmIylWWYdRBFFIzr4HwBm1qyHfGjl8qFfWwtb3M+N4FT7V8mYFFcH NsI8ko5OmvLIaTfedhhSSDd1gQwJfwjRocqOg3wWBgKFcQykt78LG7Sn52D3XGKIPlNK tl11S5HhDJ2Gt7ZZrcMAJsDWjTh8UK7MGGlawsYsxffHGrX9LQwjthDrlY6FdXK5q6gh Sht+o8y9KkbLvmRyk348Ter9+EWz62i6Vx0g1R+1qwJH8foAUktVPR3WhQK6Yzyr4LLo s4/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hCeM9CJ6pzmi1o3KK+XpvWx7SxeTxw84lBGmVzLUTd8=; b=N2r9SI5AnLW6YsSM5B/TqycmDO3Ehp92T6pcOrfE9iZiYYcy/W11CxmYlEJOUq60z3 R2KLFDPluCwQISROLUdNrxsLqKzGIFpVDDYICdw8JW6tO7f01Ij/rPQSQQ/fjhRdUqIf rycgd0mBRX1RA048zPbphb0ftMKr3Bfm7O64QYU2QCPqKP/T6z9VOctk/uP4DbBbTI1t XCClWxhU0natvbEDkRj5fJ5KWrhJi4YV3se0bydnHWqVDJaezrfZhET52pGOTO8AwAS/ kgDQLtIXPk3vLGghme72+dyS2Y18Rs50jkRGQes1xVcDvVvDEDHQskTJiWg2YlarM1g7 /K+A== X-Gm-Message-State: APjAAAV8zdxZJJxGGGuj5OUBIH6gPcNN7R5PaJYMnFXTSA94IYGfXTEj 6zcPNdKh6nza2EiR/Nl5zwQIAOhq X-Google-Smtp-Source: APXvYqySOgedUHE0WIseUqC6YRH4GURoV+8ztV20bSWnbuN2/ag6oz0YQs44nziyGSFcOqFV5ziYRA== X-Received: by 2002:adf:dfcc:: with SMTP id q12mr35180842wrn.171.1582117156160; Wed, 19 Feb 2020 04:59:16 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:90ea:9d7:18a3:895e]) by smtp.gmail.com with ESMTPSA id h2sm3079024wrt.45.2020.02.19.04.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 04:59:15 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, daniel@ffwll.ch Subject: [PATCH 6/7] dma-buf: drop dynamic_mapping flag Date: Wed, 19 Feb 2020 13:59:09 +0100 Message-Id: <20200219125910.89147-6-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200219125910.89147-1-christian.koenig@amd.com> References: <20200219125910.89147-1-christian.koenig@amd.com> 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" SW5zdGVhZCB1c2UgdGhlIHBpbigpIGNhbGxiYWNrIHRvIGRldGVjdCBkeW5hbWljIERNQS1idWYg aGFuZGxpbmcuClNpbmNlIGFtZGdwdSBpcyBub3cgbWlncmF0ZWQgaXQgZG9lc24ndCBtYWtlIG11 Y2ggc2Vuc2UgdG8ga2VlcAp0aGUgZXh0cmEgZmxhZy4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlh biBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2RtYS1idWYv ZG1hLWJ1Zi5jICAgICAgICAgICAgICAgICAgIHwgIDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9kbWFfYnVmLmMgfCAgMSAtCiBpbmNsdWRlL2xpbnV4L2RtYS1idWYu aCAgICAgICAgICAgICAgICAgICAgIHwgMjEgKysrKystLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYyBiL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMKaW5k ZXggNWYxMGQxOTI5NDc2Li42ZDBhODJkMWIyM2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hLWJ1 Zi9kbWEtYnVmLmMKKysrIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwpAQCAtNTI0LDExICs1 MjQsMTAgQEAgc3RydWN0IGRtYV9idWYgKmRtYV9idWZfZXhwb3J0KGNvbnN0IHN0cnVjdCBkbWFf YnVmX2V4cG9ydF9pbmZvICpleHBfaW5mbykKIAl9CiAKIAlpZiAoV0FSTl9PTihleHBfaW5mby0+ b3BzLT5jYWNoZV9zZ3RfbWFwcGluZyAmJgotCQkgICAgZXhwX2luZm8tPm9wcy0+ZHluYW1pY19t YXBwaW5nKSkKKwkJICAgIChleHBfaW5mby0+b3BzLT5waW4gfHwgZXhwX2luZm8tPm9wcy0+dW5w aW4pKSkKIAkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7CiAKLQlpZiAoV0FSTl9PTighZXhwX2lu Zm8tPm9wcy0+ZHluYW1pY19tYXBwaW5nICYmCi0JCSAgICAoZXhwX2luZm8tPm9wcy0+cGluIHx8 IGV4cF9pbmZvLT5vcHMtPnVucGluKSkpCisJaWYgKFdBUk5fT04oIWV4cF9pbmZvLT5vcHMtPnBp biAhPSAhZXhwX2luZm8tPm9wcy0+dW5waW4pKQogCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsK IAogCWlmICghdHJ5X21vZHVsZV9nZXQoZXhwX2luZm8tPm93bmVyKSkKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kbWFfYnVmLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZG1hX2J1Zi5jCmluZGV4IDFhMDQwY2NmNjFiZi4uZmZlYjIw ZjExYzA3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZG1h X2J1Zi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kbWFfYnVmLmMK QEAgLTM2NCw3ICszNjQsNiBAQCBzdGF0aWMgaW50IGFtZGdwdV9kbWFfYnVmX2JlZ2luX2NwdV9h Y2Nlc3Moc3RydWN0IGRtYV9idWYgKmRtYV9idWYsCiB9CiAKIGNvbnN0IHN0cnVjdCBkbWFfYnVm X29wcyBhbWRncHVfZG1hYnVmX29wcyA9IHsKLQkuZHluYW1pY19tYXBwaW5nID0gdHJ1ZSwKIAku YXR0YWNoID0gYW1kZ3B1X2RtYV9idWZfYXR0YWNoLAogCS5kZXRhY2ggPSBhbWRncHVfZG1hX2J1 Zl9kZXRhY2gsCiAJLnBpbiA9IGFtZGdwdV9kbWFfYnVmX3BpbiwKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvbGludXgvZG1hLWJ1Zi5oIGIvaW5jbHVkZS9saW51eC9kbWEtYnVmLmgKaW5kZXggYjM4Y2Vh MjQwYjY3Li4xYWRlNDg2ZmMyYmIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvZG1hLWJ1Zi5o CisrKyBiL2luY2x1ZGUvbGludXgvZG1hLWJ1Zi5oCkBAIC00MiwxOCArNDIsNiBAQCBzdHJ1Y3Qg ZG1hX2J1Zl9vcHMgewogCSAgKi8KIAlib29sIGNhY2hlX3NndF9tYXBwaW5nOwogCi0JLyoqCi0J ICogQGR5bmFtaWNfbWFwcGluZzoKLQkgKgotCSAqIElmIHRydWUgdGhlIGZyYW1ld29yayBtYWtl cyBzdXJlIHRoYXQgdGhlIG1hcC91bm1hcF9kbWFfYnVmCi0JICogY2FsbGJhY2tzIGFyZSBhbHdh eXMgY2FsbGVkIHdpdGggdGhlIGRtYV9yZXN2IG9iamVjdCBsb2NrZWQuCi0JICoKLQkgKiBJZiBm YWxzZSB0aGUgZnJhbWV3b3JrIG1ha2VzIHN1cmUgdGhhdCB0aGUgbWFwL3VubWFwX2RtYV9idWYK LQkgKiBjYWxsYmFja3MgYXJlIGFsd2F5cyBjYWxsZWQgd2l0aG91dCB0aGUgZG1hX3Jlc3Ygb2Jq ZWN0IGxvY2tlZC4KLQkgKiBNdXR1YWwgZXhjbHVzaXZlIHdpdGggQGNhY2hlX3NndF9tYXBwaW5n LgotCSAqLwotCWJvb2wgZHluYW1pY19tYXBwaW5nOwotCiAJLyoqCiAJICogQGF0dGFjaDoKIAkg KgpAQCAtOTksNyArODcsOCBAQCBzdHJ1Y3QgZG1hX2J1Zl9vcHMgewogCSAqIFRoaXMgaXMgY2Fs bGVkIGJ5IGRtYV9idWZfcGluIGFuZCBsZXRzIHRoZSBleHBvcnRlciBrbm93IHRoYXQgdGhlCiAJ ICogRE1BLWJ1ZiBjYW4ndCBiZSBtb3ZlZCBhbnkgbW9yZS4KIAkgKgotCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkLgorCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkIGFuZCBpcyBtdXR1YWwKKwkg KiBleGNsdXNpdmUgd2l0aCBAY2FjaGVfc2d0X21hcHBpbmcuCiAJICoKIAkgKiBUaGlzIGNhbGxi YWNrIGlzIG9wdGlvbmFsIGFuZCBzaG91bGQgb25seSBiZSB1c2VkIGluIGxpbWl0ZWQgdXNlCiAJ ICogY2FzZXMgbGlrZSBzY2Fub3V0IGFuZCBub3QgZm9yIHRlbXBvcmFyeSBwaW4gb3BlcmF0aW9u cy4KQEAgLTExNiw3ICsxMDUsOCBAQCBzdHJ1Y3QgZG1hX2J1Zl9vcHMgewogCSAqIFRoaXMgaXMg Y2FsbGVkIGJ5IGRtYV9idWZfdW5waW4gYW5kIGxldHMgdGhlIGV4cG9ydGVyIGtub3cgdGhhdCB0 aGUKIAkgKiBETUEtYnVmIGNhbiBiZSBtb3ZlZCBhZ2Fpbi4KIAkgKgotCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkLgorCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkIGFuZCBpcyBtdXR1YWwKKwkg KiBleGNsdXNpdmUgd2l0aCBAY2FjaGVfc2d0X21hcHBpbmcuCiAJICoKIAkgKiBUaGlzIGNhbGxi YWNrIGlzIG9wdGlvbmFsLgogCSAqLwpAQCAtNDU1LDggKzQ0NSw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBnZXRfZG1hX2J1ZihzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmKQogICovCiBzdGF0aWMgaW5s aW5lIGJvb2wgZG1hX2J1Zl9pc19keW5hbWljKHN0cnVjdCBkbWFfYnVmICpkbWFidWYpCiB7Ci0J LyogVE9ETzogc3dpdGNoIHRvIHVzaW5nIHBpbi91bnBpbiBmdW5jdGlvbnMgYXMgaW5kaWNhdG9y LiAqLwotCXJldHVybiBkbWFidWYtPm9wcy0+ZHluYW1pY19tYXBwaW5nOworCXJldHVybiAhIWRt YWJ1Zi0+b3BzLT5waW47CiB9CiAKIC8qKgotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 B4A22C34056 for ; Wed, 19 Feb 2020 16:56:08 +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 8B8A02464E for ; Wed, 19 Feb 2020 16:56:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="giRn9oVt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B8A02464E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51A5F6E82B; Wed, 19 Feb 2020 16:56:03 +0000 (UTC) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6AF26E5B2; Wed, 19 Feb 2020 12:59:17 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id z3so441206wru.3; Wed, 19 Feb 2020 04:59:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hCeM9CJ6pzmi1o3KK+XpvWx7SxeTxw84lBGmVzLUTd8=; b=giRn9oVt2bLLBetMmwF1HDSw7QygLii+yESQB5yyQvHBoCUPNuhnnuCcO40866mAXl ZgzznsO+vKrBC+IcmIylWWYdRBFFIzr4HwBm1qyHfGjl8qFfWwtb3M+N4FT7V8mYFFcH NsI8ko5OmvLIaTfedhhSSDd1gQwJfwjRocqOg3wWBgKFcQykt78LG7Sn52D3XGKIPlNK tl11S5HhDJ2Gt7ZZrcMAJsDWjTh8UK7MGGlawsYsxffHGrX9LQwjthDrlY6FdXK5q6gh Sht+o8y9KkbLvmRyk348Ter9+EWz62i6Vx0g1R+1qwJH8foAUktVPR3WhQK6Yzyr4LLo s4/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hCeM9CJ6pzmi1o3KK+XpvWx7SxeTxw84lBGmVzLUTd8=; b=N2r9SI5AnLW6YsSM5B/TqycmDO3Ehp92T6pcOrfE9iZiYYcy/W11CxmYlEJOUq60z3 R2KLFDPluCwQISROLUdNrxsLqKzGIFpVDDYICdw8JW6tO7f01Ij/rPQSQQ/fjhRdUqIf rycgd0mBRX1RA048zPbphb0ftMKr3Bfm7O64QYU2QCPqKP/T6z9VOctk/uP4DbBbTI1t XCClWxhU0natvbEDkRj5fJ5KWrhJi4YV3se0bydnHWqVDJaezrfZhET52pGOTO8AwAS/ kgDQLtIXPk3vLGghme72+dyS2Y18Rs50jkRGQes1xVcDvVvDEDHQskTJiWg2YlarM1g7 /K+A== X-Gm-Message-State: APjAAAV8zdxZJJxGGGuj5OUBIH6gPcNN7R5PaJYMnFXTSA94IYGfXTEj 6zcPNdKh6nza2EiR/Nl5zwQIAOhq X-Google-Smtp-Source: APXvYqySOgedUHE0WIseUqC6YRH4GURoV+8ztV20bSWnbuN2/ag6oz0YQs44nziyGSFcOqFV5ziYRA== X-Received: by 2002:adf:dfcc:: with SMTP id q12mr35180842wrn.171.1582117156160; Wed, 19 Feb 2020 04:59:16 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:90ea:9d7:18a3:895e]) by smtp.gmail.com with ESMTPSA id h2sm3079024wrt.45.2020.02.19.04.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 04:59:15 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, daniel@ffwll.ch Date: Wed, 19 Feb 2020 13:59:09 +0100 Message-Id: <20200219125910.89147-6-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200219125910.89147-1-christian.koenig@amd.com> References: <20200219125910.89147-1-christian.koenig@amd.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 19 Feb 2020 16:56:01 +0000 Subject: [Intel-gfx] [PATCH 6/7] dma-buf: drop dynamic_mapping flag X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" SW5zdGVhZCB1c2UgdGhlIHBpbigpIGNhbGxiYWNrIHRvIGRldGVjdCBkeW5hbWljIERNQS1idWYg aGFuZGxpbmcuClNpbmNlIGFtZGdwdSBpcyBub3cgbWlncmF0ZWQgaXQgZG9lc24ndCBtYWtlIG11 Y2ggc2Vuc2UgdG8ga2VlcAp0aGUgZXh0cmEgZmxhZy4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlh biBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2RtYS1idWYv ZG1hLWJ1Zi5jICAgICAgICAgICAgICAgICAgIHwgIDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9kbWFfYnVmLmMgfCAgMSAtCiBpbmNsdWRlL2xpbnV4L2RtYS1idWYu aCAgICAgICAgICAgICAgICAgICAgIHwgMjEgKysrKystLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYyBiL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMKaW5k ZXggNWYxMGQxOTI5NDc2Li42ZDBhODJkMWIyM2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hLWJ1 Zi9kbWEtYnVmLmMKKysrIGIvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwpAQCAtNTI0LDExICs1 MjQsMTAgQEAgc3RydWN0IGRtYV9idWYgKmRtYV9idWZfZXhwb3J0KGNvbnN0IHN0cnVjdCBkbWFf YnVmX2V4cG9ydF9pbmZvICpleHBfaW5mbykKIAl9CiAKIAlpZiAoV0FSTl9PTihleHBfaW5mby0+ b3BzLT5jYWNoZV9zZ3RfbWFwcGluZyAmJgotCQkgICAgZXhwX2luZm8tPm9wcy0+ZHluYW1pY19t YXBwaW5nKSkKKwkJICAgIChleHBfaW5mby0+b3BzLT5waW4gfHwgZXhwX2luZm8tPm9wcy0+dW5w aW4pKSkKIAkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7CiAKLQlpZiAoV0FSTl9PTighZXhwX2lu Zm8tPm9wcy0+ZHluYW1pY19tYXBwaW5nICYmCi0JCSAgICAoZXhwX2luZm8tPm9wcy0+cGluIHx8 IGV4cF9pbmZvLT5vcHMtPnVucGluKSkpCisJaWYgKFdBUk5fT04oIWV4cF9pbmZvLT5vcHMtPnBp biAhPSAhZXhwX2luZm8tPm9wcy0+dW5waW4pKQogCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsK IAogCWlmICghdHJ5X21vZHVsZV9nZXQoZXhwX2luZm8tPm93bmVyKSkKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kbWFfYnVmLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZG1hX2J1Zi5jCmluZGV4IDFhMDQwY2NmNjFiZi4uZmZlYjIw ZjExYzA3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZG1h X2J1Zi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kbWFfYnVmLmMK QEAgLTM2NCw3ICszNjQsNiBAQCBzdGF0aWMgaW50IGFtZGdwdV9kbWFfYnVmX2JlZ2luX2NwdV9h Y2Nlc3Moc3RydWN0IGRtYV9idWYgKmRtYV9idWYsCiB9CiAKIGNvbnN0IHN0cnVjdCBkbWFfYnVm X29wcyBhbWRncHVfZG1hYnVmX29wcyA9IHsKLQkuZHluYW1pY19tYXBwaW5nID0gdHJ1ZSwKIAku YXR0YWNoID0gYW1kZ3B1X2RtYV9idWZfYXR0YWNoLAogCS5kZXRhY2ggPSBhbWRncHVfZG1hX2J1 Zl9kZXRhY2gsCiAJLnBpbiA9IGFtZGdwdV9kbWFfYnVmX3BpbiwKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvbGludXgvZG1hLWJ1Zi5oIGIvaW5jbHVkZS9saW51eC9kbWEtYnVmLmgKaW5kZXggYjM4Y2Vh MjQwYjY3Li4xYWRlNDg2ZmMyYmIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvZG1hLWJ1Zi5o CisrKyBiL2luY2x1ZGUvbGludXgvZG1hLWJ1Zi5oCkBAIC00MiwxOCArNDIsNiBAQCBzdHJ1Y3Qg ZG1hX2J1Zl9vcHMgewogCSAgKi8KIAlib29sIGNhY2hlX3NndF9tYXBwaW5nOwogCi0JLyoqCi0J ICogQGR5bmFtaWNfbWFwcGluZzoKLQkgKgotCSAqIElmIHRydWUgdGhlIGZyYW1ld29yayBtYWtl cyBzdXJlIHRoYXQgdGhlIG1hcC91bm1hcF9kbWFfYnVmCi0JICogY2FsbGJhY2tzIGFyZSBhbHdh eXMgY2FsbGVkIHdpdGggdGhlIGRtYV9yZXN2IG9iamVjdCBsb2NrZWQuCi0JICoKLQkgKiBJZiBm YWxzZSB0aGUgZnJhbWV3b3JrIG1ha2VzIHN1cmUgdGhhdCB0aGUgbWFwL3VubWFwX2RtYV9idWYK LQkgKiBjYWxsYmFja3MgYXJlIGFsd2F5cyBjYWxsZWQgd2l0aG91dCB0aGUgZG1hX3Jlc3Ygb2Jq ZWN0IGxvY2tlZC4KLQkgKiBNdXR1YWwgZXhjbHVzaXZlIHdpdGggQGNhY2hlX3NndF9tYXBwaW5n LgotCSAqLwotCWJvb2wgZHluYW1pY19tYXBwaW5nOwotCiAJLyoqCiAJICogQGF0dGFjaDoKIAkg KgpAQCAtOTksNyArODcsOCBAQCBzdHJ1Y3QgZG1hX2J1Zl9vcHMgewogCSAqIFRoaXMgaXMgY2Fs bGVkIGJ5IGRtYV9idWZfcGluIGFuZCBsZXRzIHRoZSBleHBvcnRlciBrbm93IHRoYXQgdGhlCiAJ ICogRE1BLWJ1ZiBjYW4ndCBiZSBtb3ZlZCBhbnkgbW9yZS4KIAkgKgotCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkLgorCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkIGFuZCBpcyBtdXR1YWwKKwkg KiBleGNsdXNpdmUgd2l0aCBAY2FjaGVfc2d0X21hcHBpbmcuCiAJICoKIAkgKiBUaGlzIGNhbGxi YWNrIGlzIG9wdGlvbmFsIGFuZCBzaG91bGQgb25seSBiZSB1c2VkIGluIGxpbWl0ZWQgdXNlCiAJ ICogY2FzZXMgbGlrZSBzY2Fub3V0IGFuZCBub3QgZm9yIHRlbXBvcmFyeSBwaW4gb3BlcmF0aW9u cy4KQEAgLTExNiw3ICsxMDUsOCBAQCBzdHJ1Y3QgZG1hX2J1Zl9vcHMgewogCSAqIFRoaXMgaXMg Y2FsbGVkIGJ5IGRtYV9idWZfdW5waW4gYW5kIGxldHMgdGhlIGV4cG9ydGVyIGtub3cgdGhhdCB0 aGUKIAkgKiBETUEtYnVmIGNhbiBiZSBtb3ZlZCBhZ2Fpbi4KIAkgKgotCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkLgorCSAqIFRoaXMgaXMgY2Fs bGVkIHdpdGggdGhlIGRtYWJ1Zi0+cmVzdiBvYmplY3QgbG9ja2VkIGFuZCBpcyBtdXR1YWwKKwkg KiBleGNsdXNpdmUgd2l0aCBAY2FjaGVfc2d0X21hcHBpbmcuCiAJICoKIAkgKiBUaGlzIGNhbGxi YWNrIGlzIG9wdGlvbmFsLgogCSAqLwpAQCAtNDU1LDggKzQ0NSw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBnZXRfZG1hX2J1ZihzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmKQogICovCiBzdGF0aWMgaW5s aW5lIGJvb2wgZG1hX2J1Zl9pc19keW5hbWljKHN0cnVjdCBkbWFfYnVmICpkbWFidWYpCiB7Ci0J LyogVE9ETzogc3dpdGNoIHRvIHVzaW5nIHBpbi91bnBpbiBmdW5jdGlvbnMgYXMgaW5kaWNhdG9y LiAqLwotCXJldHVybiBkbWFidWYtPm9wcy0+ZHluYW1pY19tYXBwaW5nOworCXJldHVybiAhIWRt YWJ1Zi0+b3BzLT5waW47CiB9CiAKIC8qKgotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK