linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: akpm@linux-foundation.org
Cc: sumit.semwal@linaro.org, linux-media@vger.kernel.org,
	dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 1/2] drm/shmem-helpers: revert "Redirect mmap for imported dma-buf"
Date: Mon, 14 Sep 2020 15:29:19 +0200	[thread overview]
Message-ID: <20200914132920.59183-2-christian.koenig@amd.com> (raw)
In-Reply-To: <20200914132920.59183-1-christian.koenig@amd.com>

This reverts commit 26d3ac3cb04d171a861952e89324e347598a347f.

We need to figure out if dma_buf_mmap() is valid or not first.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 0a952f27c184..cd727343f72b 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -594,9 +594,6 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 	/* Remove the fake offset */
 	vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node);
 
-	if (obj->import_attach)
-		return dma_buf_mmap(obj->dma_buf, vma, 0);
-
 	shmem = to_drm_gem_shmem_obj(obj);
 
 	ret = drm_gem_shmem_get_pages(shmem);
-- 
2.17.1


  reply	other threads:[~2020-09-14 13:40 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-14 13:29 Changing vma->vm_file in dma_buf_mmap() Christian König
2020-09-14 13:29 ` Christian König [this message]
2020-09-15 10:39   ` [PATCH 1/2] drm/shmem-helpers: revert "Redirect mmap for imported dma-buf" Daniel Vetter
2020-09-15 11:03     ` Christian König
2020-09-15 11:07       ` Daniel Vetter
2020-09-14 13:29 ` [PATCH 2/2] mm: introduce vma_set_file function Christian König
2020-09-15  9:19   ` kernel test robot
2020-09-15 11:57   ` kernel test robot
2020-09-14 13:30 ` Changing vma->vm_file in dma_buf_mmap() Christian König
2020-09-14 14:06   ` Jason Gunthorpe
2020-09-14 18:26     ` Christian König
2020-09-16  9:53       ` Daniel Vetter
     [not found]         ` <fc8f2af7-9fc2-cb55-3065-75a4060b7c82@amd.com>
     [not found]           ` <b621db68-30b9-cc3f-c2c0-237a7fe4db09@amd.com>
2020-09-16 12:41             ` Daniel Vetter
2020-09-16 14:07         ` Jason Gunthorpe
2020-09-16 14:14           ` Christian König
2020-09-16 15:24             ` Daniel Vetter
2020-09-16 15:31               ` [Linaro-mm-sig] " Christian König
2020-09-17  6:23                 ` Daniel Vetter
2020-09-17  7:11                   ` Christian König
2020-09-17  8:09                     ` Daniel Vetter
2020-09-17 11:31                       ` Jason Gunthorpe
2020-09-17 12:03                         ` Christian König
2020-09-17 12:18                           ` Jason Gunthorpe
2020-09-17 12:24                             ` Christian König
2020-09-17 12:26                               ` Daniel Vetter
2020-09-17 14:35                               ` Jason Gunthorpe
2020-09-17 14:54                                 ` Christian König
2020-09-17 15:24                                   ` Jason Gunthorpe
2020-09-17 15:37                                     ` Daniel Vetter
2020-09-17 16:06                                       ` Christian König
2020-09-17 16:39                                         ` Jason Gunthorpe
2020-09-17 17:23                                           ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200914132920.59183-2-christian.koenig@amd.com \
    --to=ckoenig.leichtzumerken@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linaro-mm-sig@lists.linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=sumit.semwal@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).