* [PATCH v2] gpu: drm: v3d: use new return type vm_fault_t
@ 2018-07-04 14:55 Souptick Joarder
2018-07-04 16:42 ` Matthew Wilcox
0 siblings, 1 reply; 5+ messages in thread
From: Souptick Joarder @ 2018-07-04 14:55 UTC (permalink / raw)
To: willy, eric, airlied
Cc: dri-devel, linux-kernel, svptas.linux, brajeswar.linux,
sabyasachi.linux, ajitn.linux
Convert v3d_gem_fault to return vm_fault_t
Instead of converting an errno into a vm_fault_t ourselves, use
vmf_insert_mixed() which returns a vm_fault_t directly.
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
v2: Address Matthew's comment.
Updated the changelog
drivers/gpu/drm/v3d/v3d_bo.c | 28 +++++-----------------------
drivers/gpu/drm/v3d/v3d_drv.h | 3 ++-
2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
index 7b1e2a5..54d9651 100644
--- a/drivers/gpu/drm/v3d/v3d_bo.c
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
@@ -227,37 +227,19 @@ struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj)
vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
}
-int v3d_gem_fault(struct vm_fault *vmf)
+vm_fault_t v3d_gem_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
struct drm_gem_object *obj = vma->vm_private_data;
struct v3d_bo *bo = to_v3d_bo(obj);
- unsigned long pfn;
+ pfn_t pfn;
pgoff_t pgoff;
- int ret;
/* We don't use vmf->pgoff since that has the fake offset: */
pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
- pfn = page_to_pfn(bo->pages[pgoff]);
-
- ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
-
- switch (ret) {
- case -EAGAIN:
- case 0:
- case -ERESTARTSYS:
- case -EINTR:
- case -EBUSY:
- /*
- * EBUSY is ok: this just means that another thread
- * already did the job.
- */
- return VM_FAULT_NOPAGE;
- case -ENOMEM:
- return VM_FAULT_OOM;
- default:
- return VM_FAULT_SIGBUS;
- }
+ pfn = __pfn_to_pfn_t(page_to_pfn(bo->pages[pgoff]), PFN_DEV);
+
+ return vmf_insert_mixed(vma, vmf->address, pfn);
}
int v3d_mmap(struct file *filp, struct vm_area_struct *vma)
diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
index a043ac3..09aa634 100644
--- a/drivers/gpu/drm/v3d/v3d_drv.h
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
@@ -2,6 +2,7 @@
/* Copyright (C) 2015-2018 Broadcom */
#include <linux/reservation.h>
+#include <linux/mm_types.h>
#include <drm/drmP.h>
#include <drm/drm_encoder.h>
#include <drm/drm_gem.h>
@@ -248,7 +249,7 @@ int v3d_mmap_bo_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int v3d_get_bo_offset_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-int v3d_gem_fault(struct vm_fault *vmf);
+vm_fault_t v3d_gem_fault(struct vm_fault *vmf);
int v3d_mmap(struct file *filp, struct vm_area_struct *vma);
struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj);
int v3d_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] gpu: drm: v3d: use new return type vm_fault_t
2018-07-04 14:55 [PATCH v2] gpu: drm: v3d: use new return type vm_fault_t Souptick Joarder
@ 2018-07-04 16:42 ` Matthew Wilcox
2018-07-05 18:46 ` Eric Anholt
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Wilcox @ 2018-07-04 16:42 UTC (permalink / raw)
To: Souptick Joarder
Cc: eric, airlied, dri-devel, linux-kernel, svptas.linux,
brajeswar.linux, sabyasachi.linux, ajitn.linux
On Wed, Jul 04, 2018 at 08:25:57PM +0530, Souptick Joarder wrote:
> Convert v3d_gem_fault to return vm_fault_t
>
> Instead of converting an errno into a vm_fault_t ourselves, use
> vmf_insert_mixed() which returns a vm_fault_t directly.
>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <willy@infradead.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] gpu: drm: v3d: use new return type vm_fault_t
2018-07-04 16:42 ` Matthew Wilcox
@ 2018-07-05 18:46 ` Eric Anholt
0 siblings, 0 replies; 5+ messages in thread
From: Eric Anholt @ 2018-07-05 18:46 UTC (permalink / raw)
To: Matthew Wilcox, Souptick Joarder
Cc: airlied, dri-devel, linux-kernel, svptas.linux, brajeswar.linux,
sabyasachi.linux, ajitn.linux
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
Matthew Wilcox <willy@infradead.org> writes:
> On Wed, Jul 04, 2018 at 08:25:57PM +0530, Souptick Joarder wrote:
>> Convert v3d_gem_fault to return vm_fault_t
>>
>> Instead of converting an errno into a vm_fault_t ourselves, use
>> vmf_insert_mixed() which returns a vm_fault_t directly.
>>
>> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
>
> Reviewed-by: Matthew Wilcox <willy@infradead.org>
Thanks! I touched up the commit message and pushed to drm-misc-next.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] gpu: drm: v3d: use new return type vm_fault_t
@ 2018-07-04 14:48 Souptick Joarder
2018-07-04 14:47 ` Souptick Joarder
0 siblings, 1 reply; 5+ messages in thread
From: Souptick Joarder @ 2018-07-04 14:48 UTC (permalink / raw)
To: willy, eric, airlied
Cc: dri-devel, linux-kernel, svptas.linux, brajeswar.linux,
sabyasachi.linux, ajitn.linux
Convert v3d_gem_fault to return vm_fault_t
Instead of converting an errno into a vm_fault_t ourselves, use
vmf_insert_mixed() which returns a vm_fault_t directly.
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
drivers/gpu/drm/v3d/v3d_bo.c | 28 +++++-----------------------
drivers/gpu/drm/v3d/v3d_drv.h | 3 ++-
2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
index 7b1e2a5..54d9651 100644
--- a/drivers/gpu/drm/v3d/v3d_bo.c
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
@@ -227,37 +227,19 @@ struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj)
vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
}
-int v3d_gem_fault(struct vm_fault *vmf)
+vm_fault_t v3d_gem_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
struct drm_gem_object *obj = vma->vm_private_data;
struct v3d_bo *bo = to_v3d_bo(obj);
- unsigned long pfn;
+ pfn_t pfn;
pgoff_t pgoff;
- int ret;
/* We don't use vmf->pgoff since that has the fake offset: */
pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
- pfn = page_to_pfn(bo->pages[pgoff]);
-
- ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
-
- switch (ret) {
- case -EAGAIN:
- case 0:
- case -ERESTARTSYS:
- case -EINTR:
- case -EBUSY:
- /*
- * EBUSY is ok: this just means that another thread
- * already did the job.
- */
- return VM_FAULT_NOPAGE;
- case -ENOMEM:
- return VM_FAULT_OOM;
- default:
- return VM_FAULT_SIGBUS;
- }
+ pfn = __pfn_to_pfn_t(page_to_pfn(bo->pages[pgoff]), PFN_DEV);
+
+ return vmf_insert_mixed(vma, vmf->address, pfn);
}
int v3d_mmap(struct file *filp, struct vm_area_struct *vma)
diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
index a043ac3..09aa634 100644
--- a/drivers/gpu/drm/v3d/v3d_drv.h
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
@@ -2,6 +2,7 @@
/* Copyright (C) 2015-2018 Broadcom */
#include <linux/reservation.h>
+#include <linux/mm_types.h>
#include <drm/drmP.h>
#include <drm/drm_encoder.h>
#include <drm/drm_gem.h>
@@ -248,7 +249,7 @@ int v3d_mmap_bo_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int v3d_get_bo_offset_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-int v3d_gem_fault(struct vm_fault *vmf);
+vm_fault_t v3d_gem_fault(struct vm_fault *vmf);
int v3d_mmap(struct file *filp, struct vm_area_struct *vma);
struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj);
int v3d_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] gpu: drm: v3d: use new return type vm_fault_t
2018-07-04 14:48 Souptick Joarder
@ 2018-07-04 14:47 ` Souptick Joarder
0 siblings, 0 replies; 5+ messages in thread
From: Souptick Joarder @ 2018-07-04 14:47 UTC (permalink / raw)
To: Matthew Wilcox, Eric Anholt, airlied
Cc: dri-devel, linux-kernel, SUMAN TRIPATHI, brajeswar.linux,
Sabyasachi Gupta, ajitn.linux
please ignore this mail.
On Wed, Jul 4, 2018 at 8:18 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
> Convert v3d_gem_fault to return vm_fault_t
>
> Instead of converting an errno into a vm_fault_t ourselves, use
> vmf_insert_mixed() which returns a vm_fault_t directly.
>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> ---
> drivers/gpu/drm/v3d/v3d_bo.c | 28 +++++-----------------------
> drivers/gpu/drm/v3d/v3d_drv.h | 3 ++-
> 2 files changed, 7 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
> index 7b1e2a5..54d9651 100644
> --- a/drivers/gpu/drm/v3d/v3d_bo.c
> +++ b/drivers/gpu/drm/v3d/v3d_bo.c
> @@ -227,37 +227,19 @@ struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj)
> vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
> }
>
> -int v3d_gem_fault(struct vm_fault *vmf)
> +vm_fault_t v3d_gem_fault(struct vm_fault *vmf)
> {
> struct vm_area_struct *vma = vmf->vma;
> struct drm_gem_object *obj = vma->vm_private_data;
> struct v3d_bo *bo = to_v3d_bo(obj);
> - unsigned long pfn;
> + pfn_t pfn;
> pgoff_t pgoff;
> - int ret;
>
> /* We don't use vmf->pgoff since that has the fake offset: */
> pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
> - pfn = page_to_pfn(bo->pages[pgoff]);
> -
> - ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
> -
> - switch (ret) {
> - case -EAGAIN:
> - case 0:
> - case -ERESTARTSYS:
> - case -EINTR:
> - case -EBUSY:
> - /*
> - * EBUSY is ok: this just means that another thread
> - * already did the job.
> - */
> - return VM_FAULT_NOPAGE;
> - case -ENOMEM:
> - return VM_FAULT_OOM;
> - default:
> - return VM_FAULT_SIGBUS;
> - }
> + pfn = __pfn_to_pfn_t(page_to_pfn(bo->pages[pgoff]), PFN_DEV);
> +
> + return vmf_insert_mixed(vma, vmf->address, pfn);
> }
>
> int v3d_mmap(struct file *filp, struct vm_area_struct *vma)
> diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
> index a043ac3..09aa634 100644
> --- a/drivers/gpu/drm/v3d/v3d_drv.h
> +++ b/drivers/gpu/drm/v3d/v3d_drv.h
> @@ -2,6 +2,7 @@
> /* Copyright (C) 2015-2018 Broadcom */
>
> #include <linux/reservation.h>
> +#include <linux/mm_types.h>
> #include <drm/drmP.h>
> #include <drm/drm_encoder.h>
> #include <drm/drm_gem.h>
> @@ -248,7 +249,7 @@ int v3d_mmap_bo_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
> int v3d_get_bo_offset_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
> -int v3d_gem_fault(struct vm_fault *vmf);
> +vm_fault_t v3d_gem_fault(struct vm_fault *vmf);
> int v3d_mmap(struct file *filp, struct vm_area_struct *vma);
> struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj);
> int v3d_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-07-05 18:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-04 14:55 [PATCH v2] gpu: drm: v3d: use new return type vm_fault_t Souptick Joarder
2018-07-04 16:42 ` Matthew Wilcox
2018-07-05 18:46 ` Eric Anholt
-- strict thread matches above, loose matches on Subject: below --
2018-07-04 14:48 Souptick Joarder
2018-07-04 14:47 ` Souptick Joarder
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).