From: Konstantin Khlebnikov <khlebnikov@openvz.org>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org
Cc: Dave Airlie <airlied@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
dri-devel@lists.freedesktop.org
Subject: [PATCH 5/7] mm, drm/udl: fixup vma flags on mmap
Date: Sat, 31 Mar 2012 13:29:25 +0400 [thread overview]
Message-ID: <20120331092924.19920.4931.stgit@zurg> (raw)
In-Reply-To: <20120331091049.19373.28994.stgit@zurg>
There should be VM_MIXEDMAP, not VM_PFNMAP, because udl_gem_fault() inserts
pages via vm_insert_page(). Other drm/gem drivers already do this.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Dave Airlie <airlied@redhat.com>
Cc: dri-devel@lists.freedesktop.org
---
drivers/gpu/drm/udl/udl_drv.c | 2 +-
drivers/gpu/drm/udl/udl_drv.h | 1 +
drivers/gpu/drm/udl/udl_gem.c | 14 ++++++++++++++
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 5340c5f..5367390 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -47,7 +47,7 @@ static struct vm_operations_struct udl_gem_vm_ops = {
static const struct file_operations udl_driver_fops = {
.owner = THIS_MODULE,
.open = drm_open,
- .mmap = drm_gem_mmap,
+ .mmap = udl_drm_gem_mmap,
.poll = drm_poll,
.read = drm_read,
.unlocked_ioctl = drm_ioctl,
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 1612954..96820d0 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -121,6 +121,7 @@ struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev,
int udl_gem_vmap(struct udl_gem_object *obj);
void udl_gem_vunmap(struct udl_gem_object *obj);
+int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 852642d..92f19ef 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -71,6 +71,20 @@ int udl_dumb_destroy(struct drm_file *file, struct drm_device *dev,
return drm_gem_handle_delete(file, handle);
}
+int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+ int ret;
+
+ ret = drm_gem_mmap(filp, vma);
+ if (ret)
+ return ret;
+
+ vma->vm_flags &= ~VM_PFNMAP;
+ vma->vm_flags |= VM_MIXEDMAP;
+
+ return ret;
+}
+
int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct udl_gem_object *obj = to_udl_bo(vma->vm_private_data);
next prev parent reply other threads:[~2012-03-31 9:30 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-31 9:25 [PATCH 0/7] mm: vma->vm_flags diet Konstantin Khlebnikov
2012-03-31 9:29 ` [PATCH 1/7] mm, x86, PAT: rework linear pfn-mmap tracking Konstantin Khlebnikov
2012-03-31 17:09 ` [PATCH 1/7 v2] " Konstantin Khlebnikov
2012-04-03 0:46 ` [x86 PAT PATCH 0/2] x86 PAT vm_flag code refactoring Suresh Siddha
2012-04-03 0:46 ` [x86 PAT PATCH 1/2] x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines Suresh Siddha
2012-04-03 5:37 ` Konstantin Khlebnikov
2012-04-03 23:31 ` Suresh Siddha
2012-04-04 4:43 ` Konstantin Khlebnikov
2012-04-05 11:56 ` Konstantin Khlebnikov
2012-04-06 0:01 ` [v3 VM_PAT PATCH 0/3] x86 VM_PAT series Suresh Siddha
2012-04-06 0:01 ` [v3 VM_PAT PATCH 1/3] x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines Suresh Siddha
2012-04-06 0:01 ` [v3 VM_PAT PATCH 2/3] x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn Suresh Siddha
2012-04-06 0:01 ` [v3 VM_PAT PATCH 3/3] mm, x86, PAT: rework linear pfn-mmap tracking Suresh Siddha
2012-04-03 0:46 ` [x86 PAT PATCH 2/2] " Suresh Siddha
2012-04-03 5:48 ` Konstantin Khlebnikov
2012-04-03 5:55 ` Konstantin Khlebnikov
2012-04-03 6:03 ` [x86 PAT PATCH 0/2] x86 PAT vm_flag code refactoring Konstantin Khlebnikov
2012-04-03 23:14 ` Suresh Siddha
2012-04-04 4:40 ` Konstantin Khlebnikov
2012-03-31 9:29 ` [PATCH 2/7] mm: introduce vma flag VM_ARCH_1 Konstantin Khlebnikov
2012-03-31 22:25 ` Benjamin Herrenschmidt
2012-03-31 9:29 ` [PATCH 3/7] mm: kill vma flag VM_CAN_NONLINEAR Konstantin Khlebnikov
2012-03-31 17:01 ` Linus Torvalds
2012-03-31 9:29 ` [PATCH 4/7] mm: kill vma flag VM_INSERTPAGE Konstantin Khlebnikov
2012-03-31 9:29 ` Konstantin Khlebnikov [this message]
2012-03-31 9:29 ` [PATCH 6/7] mm: kill vma flag VM_EXECUTABLE Konstantin Khlebnikov
2012-03-31 20:13 ` Oleg Nesterov
2012-03-31 20:39 ` Cyrill Gorcunov
2012-04-02 9:46 ` Konstantin Khlebnikov
2012-04-02 9:54 ` Cyrill Gorcunov
2012-04-02 10:13 ` Konstantin Khlebnikov
2012-04-02 14:48 ` Oleg Nesterov
2012-04-02 16:02 ` Cyrill Gorcunov
2012-04-02 16:19 ` Konstantin Khlebnikov
2012-04-02 16:27 ` Cyrill Gorcunov
2012-04-02 17:14 ` Konstantin Khlebnikov
2012-04-02 18:05 ` Cyrill Gorcunov
2012-04-02 23:04 ` Matt Helsley
2012-04-03 5:10 ` Konstantin Khlebnikov
2012-04-03 18:16 ` Matt Helsley
2012-04-03 19:32 ` Cyrill Gorcunov
2012-04-05 20:29 ` Matt Helsley
2012-04-05 20:53 ` Cyrill Gorcunov
2012-04-05 21:04 ` Konstantin Khlebnikov
2012-04-05 21:44 ` Matt Helsley
2012-04-05 21:55 ` Linus Torvalds
2012-04-06 4:36 ` Konstantin Khlebnikov
2012-04-02 23:18 ` Matt Helsley
2012-04-03 5:06 ` Konstantin Khlebnikov
2012-04-06 22:48 ` Andrew Morton
2012-03-31 9:29 ` [PATCH 7/7] mm: move madvise vma flags to the end Konstantin Khlebnikov
2012-03-31 14:06 ` [PATCH 0/7] mm: vma->vm_flags diet Andi Kleen
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=20120331092924.19920.4931.stgit@zurg \
--to=khlebnikov@openvz.org \
--cc=airlied@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=torvalds@linux-foundation.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).