gpu: drm: udl: Adding new typedef vm_fault_t
Subsystems (3)
PATCH v2 1/1 gpu: drm: udl: Adding new typedef vm_fault_t
Use new return type vm_fault_t for fault and huge_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.
Commit 1c8f422059ae ("mm: change return type to vm_fault_t")
Previously vm_insert_page() returns err which driver mapped into VM_FAULT_* type. The new function vmf_ insert_page() will replace this inefficiency by returning VM_FAULT_* type.
---
v2: Updated the change log
drivers/gpu/drm/udl/udl_drv.h | 3 ++- drivers/gpu/drm/udl/udl_gem.c | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/udl/udl_drv.h +2 -1
@@ -16,6 +16,7 @@#include <linux/usb.h> #include <drm/drm_gem.h> +#include <linux/mm_types.h> #define DRIVER_NAME "udl"#define DRIVER_DESC "DisplayLink"
@@ -134,7 +135,7 @@ struct drm_gem_object *udl_gem_prime_import(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_fault *vmf); +vm_fault_t udl_gem_fault (struct vm_fault *vmf);int udl_handle_damage (struct udl_framebuffer *fb,int x,int y,int width,int height);
drivers/gpu/drm/udl/udl_gem.c +2 -13
@@ -100,13 +100,12 @@ int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)return ret; } -int udl_gem_fault (struct vm_fault *vmf) +vm_fault_t udl_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct udl_gem_object *obj =to_udl_bo (vma->vm_private_data);struct page *page;unsigned int page_offset; -int ret =0 ; page_offset = (vmf->address - vma->vm_start) >>PAGE_SHIFT ;
@@ -114,17 +113,7 @@ int udl_gem_fault(struct vm_fault *vmf)return VM_FAULT_SIGBUS ; page = obj->pages[page_offset]; - ret =vm_insert_page (vma, vmf->address, page); -switch (ret) { -case -EAGAIN : -case 0 : -case -ERESTARTSYS : -return VM_FAULT_NOPAGE ; -case -ENOMEM : -return VM_FAULT_OOM ; -default : -return VM_FAULT_SIGBUS ; - } +return vmf_insert_page (vma, vmf->address, page); }int udl_gem_get_pages (struct udl_gem_object *obj)
--
1.9.1
Quoted 82 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault andhuge_faulthandler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.Commit
1c8f422059ae("mm: change return type tovm_fault_t")Previously
vm_insert_page()returns err which driver mapped into VM_FAULT_* type. The new functionvmf_insert_page()will replace this inefficiency by returning VM_FAULT_* type.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>---
v2: Updated the change logdrivers/gpu/drm/udl/udl_drv.h | 3 ++- drivers/gpu/drm/udl/udl_gem.c | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-)drivers/gpu/drm/udl/udl_drv.h +2
-1@@ -16,6 +16,7 @@#include <linux/usb.h> #include <drm/drm_gem.h> +#include <linux/mm_types.h> #define DRIVER_NAME "udl"#define DRIVER_DESC "DisplayLink"@@ -134,7 +135,7 @@ struct drm_gem_object *udl_gem_prime_import(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_fault *vmf); +vm_fault_t udl_gem_fault (struct vm_fault *vmf);int udl_handle_damage (struct udl_framebuffer *fb,int x,int y,int width,int height);drivers/gpu/drm/udl/udl_gem.c +2
-14@@ -100,13 +100,12 @@ int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)return ret; } -int udl_gem_fault (struct vm_fault *vmf) +vm_fault_t udl_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct udl_gem_object *obj =to_udl_bo (vma->vm_private_data);struct page *page;unsigned int page_offset; -int ret =0 ; page_offset = (vmf->address - vma->vm_start) >>PAGE_SHIFT ;@@ -114,17 +113,7 @@ int udl_gem_fault(struct vm_fault *vmf)return VM_FAULT_SIGBUS ; page = obj->pages[page_offset]; - ret =vm_insert_page (vma, vmf->address, page); -switch (ret) { -case -EAGAIN : -case 0 : -case -ERESTARTSYS : -return VM_FAULT_NOPAGE ; -case -ENOMEM : -return VM_FAULT_OOM ; -default : -return VM_FAULT_SIGBUS ; - } +return vmf_insert_page (vma, vmf->address, page); }int udl_gem_get_pages (struct udl_gem_object *obj) --
Quoted 2 lines
1.9.1
Any comment on this patch ?
Quoted 81 lines · Souptick Joarder
Quoted 80 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault andhuge_faulthandler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.Commit
1c8f422059ae("mm: change return type tovm_fault_t")Previously
vm_insert_page()returns err which driver mapped into VM_FAULT_* type. The new functionvmf_insert_page()will replace this inefficiency by returning VM_FAULT_* type.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>---
v2: Updated the change logdrivers/gpu/drm/udl/udl_drv.h | 3 ++- drivers/gpu/drm/udl/udl_gem.c | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-)drivers/gpu/drm/udl/udl_drv.h +2
-1@@ -16,6 +16,7 @@#include <linux/usb.h> #include <drm/drm_gem.h> +#include <linux/mm_types.h> #define DRIVER_NAME "udl"#define DRIVER_DESC "DisplayLink"@@ -134,7 +135,7 @@ struct drm_gem_object *udl_gem_prime_import(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_fault *vmf); +vm_fault_t udl_gem_fault (struct vm_fault *vmf);int udl_handle_damage (struct udl_framebuffer *fb,int x,int y,int width,int height);drivers/gpu/drm/udl/udl_gem.c +2
-13@@ -100,13 +100,12 @@ int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)return ret; } -int udl_gem_fault (struct vm_fault *vmf) +vm_fault_t udl_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct udl_gem_object *obj =to_udl_bo (vma->vm_private_data);struct page *page;unsigned int page_offset; -int ret =0 ; page_offset = (vmf->address - vma->vm_start) >>PAGE_SHIFT ;@@ -114,17 +113,7 @@ int udl_gem_fault(struct vm_fault *vmf)return VM_FAULT_SIGBUS ; page = obj->pages[page_offset]; - ret =vm_insert_page (vma, vmf->address, page); -switch (ret) { -case -EAGAIN : -case 0 : -case -ERESTARTSYS : -return VM_FAULT_NOPAGE ; -case -ENOMEM : -return VM_FAULT_OOM ; -default : -return VM_FAULT_SIGBUS ; - } +return vmf_insert_page (vma, vmf->address, page); }
Quoted 6 lines
Quoted 4 lines
drivers/gpu/drm/udl/udl_gem.c +0
-1int udl_gem_get_pages (struct udl_gem_object *obj) --1.9.1
Any comment on this patch ?
If no comment, we would like to get this patch in queue for 4.18.
Quoted 89 lines · Souptick Joarder
Quoted 81 lines · Souptick Joarder
Quoted 80 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault andhuge_faulthandler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.Commit
1c8f422059ae("mm: change return type tovm_fault_t")Previously
vm_insert_page()returns err which driver mapped into VM_FAULT_* type. The new functionvmf_insert_page()will replace this inefficiency by returning VM_FAULT_* type.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>---
v2: Updated the change logdrivers/gpu/drm/udl/udl_drv.h | 3 ++- drivers/gpu/drm/udl/udl_gem.c | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-)drivers/gpu/drm/udl/udl_drv.h +2
-1@@ -16,6 +16,7 @@#include <linux/usb.h> #include <drm/drm_gem.h> +#include <linux/mm_types.h> #define DRIVER_NAME "udl"#define DRIVER_DESC "DisplayLink"@@ -134,7 +135,7 @@ struct drm_gem_object *udl_gem_prime_import(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_fault *vmf); +vm_fault_t udl_gem_fault (struct vm_fault *vmf);int udl_handle_damage (struct udl_framebuffer *fb,int x,int y,int width,int height);drivers/gpu/drm/udl/udl_gem.c +2
-13@@ -100,13 +100,12 @@ int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)return ret; } -int udl_gem_fault (struct vm_fault *vmf) +vm_fault_t udl_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct udl_gem_object *obj =to_udl_bo (vma->vm_private_data);struct page *page;unsigned int page_offset; -int ret =0 ; page_offset = (vmf->address - vma->vm_start) >>PAGE_SHIFT ;@@ -114,17 +113,7 @@ int udl_gem_fault(struct vm_fault *vmf)return VM_FAULT_SIGBUS ; page = obj->pages[page_offset]; - ret =vm_insert_page (vma, vmf->address, page); -switch (ret) { -case -EAGAIN : -case 0 : -case -ERESTARTSYS : -return VM_FAULT_NOPAGE ; -case -ENOMEM : -return VM_FAULT_OOM ; -default : -return VM_FAULT_SIGBUS ; - } +return vmf_insert_page (vma, vmf->address, page); }Quoted 6 lines
Quoted 4 lines
drivers/gpu/drm/udl/udl_gem.c +0
-1int udl_gem_get_pages (struct udl_gem_object *obj) --1.9.1
Any comment on this patch ?
Quoted 2 lines
If no comment, we would like to get this patch in queue for 4.18.
4.18 is done already, queued up for 4.19 in drm-misc-next.
Thanks, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 93 lines · Daniel Vetter
Quoted 89 lines · Souptick Joarder
Quoted 81 lines · Souptick Joarder
Quoted 80 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault andhuge_faulthandler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.Commit
1c8f422059ae("mm: change return type tovm_fault_t")Previously
vm_insert_page()returns err which driver mapped into VM_FAULT_* type. The new functionvmf_insert_page()will replace this inefficiency by returning VM_FAULT_* type.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>---
v2: Updated the change logdrivers/gpu/drm/udl/udl_drv.h | 3 ++- drivers/gpu/drm/udl/udl_gem.c | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-)drivers/gpu/drm/udl/udl_drv.h +2
-1@@ -16,6 +16,7 @@#include <linux/usb.h> #include <drm/drm_gem.h> +#include <linux/mm_types.h> #define DRIVER_NAME "udl"#define DRIVER_DESC "DisplayLink"@@ -134,7 +135,7 @@ struct drm_gem_object *udl_gem_prime_import(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_fault *vmf); +vm_fault_t udl_gem_fault (struct vm_fault *vmf);int udl_handle_damage (struct udl_framebuffer *fb,int x,int y,int width,int height);drivers/gpu/drm/udl/udl_gem.c +2
-13@@ -100,13 +100,12 @@ int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)return ret; } -int udl_gem_fault (struct vm_fault *vmf) +vm_fault_t udl_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct udl_gem_object *obj =to_udl_bo (vma->vm_private_data);struct page *page;unsigned int page_offset; -int ret =0 ; page_offset = (vmf->address - vma->vm_start) >>PAGE_SHIFT ;@@ -114,17 +113,7 @@ int udl_gem_fault(struct vm_fault *vmf)return VM_FAULT_SIGBUS ; page = obj->pages[page_offset]; - ret =vm_insert_page (vma, vmf->address, page); -switch (ret) { -case -EAGAIN : -case 0 : -case -ERESTARTSYS : -return VM_FAULT_NOPAGE ; -case -ENOMEM : -return VM_FAULT_OOM ; -default : -return VM_FAULT_SIGBUS ; - } +return vmf_insert_page (vma, vmf->address, page); }Quoted 6 lines
Quoted 4 lines
drivers/gpu/drm/udl/udl_gem.c +0
-1int udl_gem_get_pages (struct udl_gem_object *obj) --1.9.1
Any comment on this patch ?
Quoted 2 lines
If no comment, we would like to get this patch in queue for 4.18.
Quoted 7 lines
4.18 is done already, queued up for 4.19 in drm-misc-next.
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Thanks :)