leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/gpu/drm/gma500/: change return type to vm_fault_t

Browse Source 
Use new return type vm_fault_t for fault handler.  For now, this is just
documenting that the function returns a VM_FAULT value rather than an
errno.  Once all instances are converted, vm_fault_t will become a
distinct type.

Ref-> 1c8f422059 ("mm: change return type to vm_fault_t")

Previously vm_insert_{pfn,mixed} returns err which driver mapped into
VM_FAULT_* type.  The new function vmf_insert_{pfn,mixed} will replace
this inefficiency by returning VM_FAULT_* type.

vmf_error() is the newly introduce inline function in 4.17-rc6.

Link: http://lkml.kernel.org/r/20180713154541.GA3345@jordon-HP-15-Notebook-PC
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Souptick Joarder 2018-08-23 17:01:22 -07:00 committed by Linus Torvalds
parent 038a07a542
commit 0edf681375
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/gma500/framebuffer.c
View File

@ -108,7 +108,7 @@ static int psbfb_pan(struct fb_var_screeninfo *var, struct fb_info *info)
return 0; return 0;
} }
static int psbfb_vm_fault(struct vm_fault *vmf) static vm_fault_t psbfb_vm_fault(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct psb_framebuffer *psbfb = vma->vm_private_data; struct psb_framebuffer *psbfb = vma->vm_private_data;
@ -118,7 +118,7 @@ static int psbfb_vm_fault(struct vm_fault *vmf)
int page_num; int page_num;
int i; int i;
unsigned long address; unsigned long address;
int ret; vm_fault_t ret = VM_FAULT_SIGBUS;
unsigned long pfn; unsigned long pfn;
unsigned long phys_addr = (unsigned long)dev_priv->stolen_base + unsigned long phys_addr = (unsigned long)dev_priv->stolen_base +
gtt->offset; gtt->offset;
@ -131,18 +131,14 @@ static int psbfb_vm_fault(struct vm_fault *vmf)
for (i = 0; i < page_num; i++) { for (i = 0; i < page_num; i++) {
pfn = (phys_addr >> PAGE_SHIFT); pfn = (phys_addr >> PAGE_SHIFT);
ret = vm_insert_mixed(vma, address, ret = vmf_insert_mixed(vma, address,
__pfn_to_pfn_t(pfn, PFN_DEV)); __pfn_to_pfn_t(pfn, PFN_DEV));
if (unlikely((ret == -EBUSY) || (ret != 0 && i > 0))) if (unlikely(ret & VM_FAULT_ERROR))
break; break;
else if (unlikely(ret != 0)) {
ret = (ret == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS;
return ret;
}
address += PAGE_SIZE; address += PAGE_SIZE;
phys_addr += PAGE_SIZE; phys_addr += PAGE_SIZE;
} }
return VM_FAULT_NOPAGE; return ret;
} }
static void psbfb_vm_open(struct vm_area_struct *vma) static void psbfb_vm_open(struct vm_area_struct *vma)

27
drivers/gpu/drm/gma500/gem.c
View File

@ -134,12 +134,13 @@ int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
* vma->vm_private_data points to the GEM object that is backing this * vma->vm_private_data points to the GEM object that is backing this
* mapping. * mapping.
*/ */
int psb_gem_fault(struct vm_fault *vmf) vm_fault_t psb_gem_fault(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct drm_gem_object *obj; struct drm_gem_object *obj;
struct gtt_range *r; struct gtt_range *r;
int ret; int err;
vm_fault_t ret;
unsigned long pfn; unsigned long pfn;
pgoff_t page_offset; pgoff_t page_offset;
struct drm_device *dev; struct drm_device *dev;
@ -158,9 +159,10 @@ int psb_gem_fault(struct vm_fault *vmf)
/* For now the mmap pins the object and it stays pinned. As things /* For now the mmap pins the object and it stays pinned. As things
stand that will do us no harm */ stand that will do us no harm */
if (r->mmapping == 0) { if (r->mmapping == 0) {
ret = psb_gtt_pin(r); err = psb_gtt_pin(r);
if (ret < 0) { if (err < 0) {
dev_err(dev->dev, "gma500: pin failed: %d\n", ret); dev_err(dev->dev, "gma500: pin failed: %d\n", err);
ret = vmf_error(err);
goto fail; goto fail;
} }
r->mmapping = 1; r->mmapping = 1;
@ -175,18 +177,9 @@ int psb_gem_fault(struct vm_fault *vmf)
pfn = (dev_priv->stolen_base + r->offset) >> PAGE_SHIFT; pfn = (dev_priv->stolen_base + r->offset) >> PAGE_SHIFT;
else else
pfn = page_to_pfn(r->pages[page_offset]); pfn = page_to_pfn(r->pages[page_offset]);
ret = vm_insert_pfn(vma, vmf->address, pfn); ret = vmf_insert_pfn(vma, vmf->address, pfn);
fail: fail:
mutex_unlock(&dev_priv->mmap_mutex); mutex_unlock(&dev_priv->mmap_mutex);
switch (ret) {
case 0: return ret;
case -ERESTARTSYS:
case -EINTR:
return VM_FAULT_NOPAGE;
case -ENOMEM:
return VM_FAULT_OOM;
default:
return VM_FAULT_SIGBUS;
}
} }

3
drivers/gpu/drm/gma500/psb_drv.h
View File

@ -21,6 +21,7 @@
#define _PSB_DRV_H_ #define _PSB_DRV_H_
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/mm_types.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_global.h> #include <drm/drm_global.h>
@ -749,7 +750,7 @@ extern int psb_gem_get_aperture(struct drm_device *dev, void *data,
struct drm_file *file); struct drm_file *file);
extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev, extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
struct drm_mode_create_dumb *args); struct drm_mode_create_dumb *args);
extern int psb_gem_fault(struct vm_fault *vmf); extern vm_fault_t psb_gem_fault(struct vm_fault *vmf);
/* psb_device.c */ /* psb_device.c */
extern const struct psb_ops psb_chip_ops; extern const struct psb_ops psb_chip_ops;