gpu: drm: drm_vm: Adding new typedef vm_fault_t
Subsystems (2)
PATCH 1/1 gpu: drm: drm_vm: Adding new typedef vm_fault_t
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.
commit 1c8f422059ae ("mm: change return type to vm_fault_t")
--- drivers/gpu/drm/drm_vm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/drm_vm.c +5 -5
@@ -100,7 +100,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)* map, get the page, increment the use count and return it. */ #if IS_ENABLED (CONFIG_AGP ) -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;
@@ -173,7 +173,7 @@ static int drm_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; /* Disallow mremap */ }#else -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {return VM_FAULT_SIGBUS ; }
@@ -189,7 +189,7 @@ static int drm_vm_fault(struct vm_fault *vmf)* Get the mapping, find the real physical page to map, get the page, and * return it. */ -static int drm_vm_shm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_shm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data;
@@ -291,7 +291,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)* * Determine the page number from the page offset and get it from drm_device_dma::pagelist. */ -static int drm_vm_dma_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_dma_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;
@@ -326,7 +326,7 @@ static int drm_vm_dma_fault(struct vm_fault *vmf)* * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. */ -static int drm_vm_sg_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_sg_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data;
--
1.9.1
Quoted 63 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. 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")Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/drm_vm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/drm_vm.c +5
-6@@ -100,7 +100,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)* map, get the page, increment the use count and return it. */ #if IS_ENABLED (CONFIG_AGP ) -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;@@ -173,7 +173,7 @@ static int drm_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; /* Disallow mremap */ }#else -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {return VM_FAULT_SIGBUS ; }@@ -189,7 +189,7 @@ static int drm_vm_fault(struct vm_fault *vmf)* Get the mapping, find the real physical page to map, get the page, and * return it. */ -static int drm_vm_shm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_shm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data;@@ -291,7 +291,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)* * Determine the page number from the page offset and get it from drm_device_dma::pagelist. */ -static int drm_vm_dma_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_dma_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;@@ -326,7 +326,7 @@ static int drm_vm_dma_fault(struct vm_fault *vmf)* * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. */ -static int drm_vm_sg_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_sg_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data; --
Quoted 2 lines
1.9.1
Daniel, if no further comment, we would like to get this patch in queue for 4.18.
Quoted 61 lines · Souptick Joarder
Quoted 60 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. 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")Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/drm_vm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/drm_vm.c +5
-5@@ -100,7 +100,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)* map, get the page, increment the use count and return it. */ #if IS_ENABLED (CONFIG_AGP ) -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;@@ -173,7 +173,7 @@ static int drm_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; /* Disallow mremap */ }#else -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {return VM_FAULT_SIGBUS ; }@@ -189,7 +189,7 @@ static int drm_vm_fault(struct vm_fault *vmf)* Get the mapping, find the real physical page to map, get the page, and * return it. */ -static int drm_vm_shm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_shm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data;@@ -291,7 +291,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)* * Determine the page number from the page offset and get it from drm_device_dma::pagelist. */ -static int drm_vm_dma_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_dma_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;@@ -326,7 +326,7 @@ static int drm_vm_dma_fault(struct vm_fault *vmf)* * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. */ -static int drm_vm_sg_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_sg_fault (struct vm_fault *vmf) {
Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/drm_vm.c +0
-1struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data; --1.9.1
Daniel, if no further comment, we would like to get this patch in queue for 4.18.
We would like to get this in queue for 4.18.
Daniel Vetter
AppliedQuoted 71 lines · Souptick Joarder
Quoted 61 lines · Souptick Joarder
Quoted 60 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. 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")Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/drm_vm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/drm_vm.c +5
-5@@ -100,7 +100,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)* map, get the page, increment the use count and return it. */ #if IS_ENABLED (CONFIG_AGP ) -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;@@ -173,7 +173,7 @@ static int drm_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; /* Disallow mremap */ }#else -static int drm_vm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_fault (struct vm_fault *vmf) {return VM_FAULT_SIGBUS ; }@@ -189,7 +189,7 @@ static int drm_vm_fault(struct vm_fault *vmf)* Get the mapping, find the real physical page to map, get the page, and * return it. */ -static int drm_vm_shm_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_shm_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data;@@ -291,7 +291,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)* * Determine the page number from the page offset and get it from drm_device_dma::pagelist. */ -static int drm_vm_dma_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_dma_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_file *priv = vma->vm_file->private_data;@@ -326,7 +326,7 @@ static int drm_vm_dma_fault(struct vm_fault *vmf)* * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. */ -static int drm_vm_sg_fault (struct vm_fault *vmf) +static vm_fault_t drm_vm_sg_fault (struct vm_fault *vmf) {Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/drm_vm.c +0
-1struct vm_area_struct *vma = vmf->vma;struct drm_local_map *map = vma->vm_private_data; --1.9.1
Daniel, if no further comment, we would like to get this patch in queue for 4.18.
Quoted 1 line
We would like to get this in queue for 4.18.
Ok this dri1 legacy horrors, so I'm the fallback maintainer once more :-)
Merged, thanks for the patch.
-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