gpu: drm: vgem: Change return type to vm_fault_t
Subsystems (2)
PATCH 1/1 gpu: drm: vgem: Change return type to vm_fault_t
Use new return type vm_fault_t for fault handler.
--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +2 -3
@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;
@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ; - ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]);
Signature · 1 line
1.9.1
Hi Sean,
Quoted 37 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-4@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ; - ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --
Quoted 2 lines
1.9.1
Any further comment on this patch ?
Sean Paul
Reviewed-byQuoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;
Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Patch looks good to me. My build test fails, though, since vm_fault_t doesn't exist in drm-misc-next yet.
So, for now,
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_t is already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -Daniel
Quoted 12 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 67 lines · Daniel Vetter
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_tis already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -DanielQuoted 6 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>Quoted 6 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Daniel/ Sean, is this patch already merged for 4.18 ?
Quoted 68 lines · Souptick Joarder
Quoted 67 lines · Daniel Vetter
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_tis already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -DanielQuoted 12 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 6 lines
Quoted 4 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.chDaniel/ Sean, is this patch already merged for 4.18 ?
Nope, fell through the cracks. Thanks for the reminder, queued for 4.18 now.
-Daniel
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
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 74 lines · Daniel Vetter
Quoted 73 lines · Souptick Joarder
Quoted 71 lines · Daniel Vetter
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_tis already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -DanielQuoted 6 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>Quoted 6 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Quoted 5 lines
Quoted 1 line
Daniel/ Sean, is this patch already merged for 4.18 ?
Nope, fell through the cracks. Thanks for the reminder, queued for 4.18 now.
-Daniel
Thanks Daniel :).
Few other similar drm driver patches are also candidates for 4.18. Are you the right Maintainer to make a request for the same ?
Quoted 77 lines · Souptick Joarder
Quoted 76 lines · Daniel Vetter
Quoted 74 lines · Souptick Joarder
Quoted 67 lines · Daniel Vetter
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_tis already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -DanielQuoted 6 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>Quoted 6 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-develQuoted 4 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.chDaniel/ Sean, is this patch already merged for 4.18 ?
Quoted 8 lines
Quoted 3 lines
Nope, fell through the cracks. Thanks for the reminder, queued for 4.18 now.
-DanielThanks Daniel :).
Few other similar drm driver patches are also candidates for 4.18. Are you the right Maintainer to make a request for the same ?
No, please try to find others. I'm occasionally picking stuff up that fell through all the cracks, as a last resort, but if I make that a habit then this doesn't scale. Please check with MAINTAINERS who's more appropriate to get nag mails from you :-)
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 87 lines · Daniel Vetter
Quoted 77 lines · Souptick Joarder
Quoted 76 lines · Daniel Vetter
Quoted 74 lines · Souptick Joarder
Quoted 67 lines · Daniel Vetter
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_tis already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -DanielQuoted 6 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>Quoted 6 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-develQuoted 4 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.chDaniel/ Sean, is this patch already merged for 4.18 ?
Quoted 8 lines
Quoted 3 lines
Nope, fell through the cracks. Thanks for the reminder, queued for 4.18 now.
-DanielThanks Daniel :).
Few other similar drm driver patches are also candidates for 4.18. Are you the right Maintainer to make a request for the same ?
Quoted 5 lines
No, please try to find others. I'm occasionally picking stuff up that fell through all the cracks, as a last resort, but if I make that a habit then this doesn't scale. Please check with
MAINTAINERSwho's more appropriate to get nag mails from you :-)
Sorry about it, I will ping the right MAINTAINERS :)
Quoted 74 lines · Daniel Vetter
Quoted 73 lines · Souptick Joarder
Quoted 71 lines · Daniel Vetter
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_tis already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -DanielQuoted 6 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>Quoted 6 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Quoted 6 lines
Quoted 1 line
Daniel/ Sean, is this patch already merged for 4.18 ?
Nope, fell through the cracks. Thanks for the reminder, queued for 4.18 now.
-Daniel
Daniel, This patch is not available in 4.18-rc-1 :-)
Quoted 75 lines · Souptick Joarder
Quoted 74 lines · Daniel Vetter
Quoted 73 lines · Souptick Joarder
Quoted 71 lines · Daniel Vetter
Quoted 46 lines · Sean Paul
Quoted 35 lines · Souptick Joarder
Hi Sean,
Quoted 32 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler.Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Matthew Wilcox <[email protected]>--- drivers/gpu/drm/vgem/vgem_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)kfree (vgem_obj); } -static int vgem_gem_fault (struct vm_fault *vmf) +static vm_fault_t vgem_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_vgem_gem_object *obj = vma->vm_private_data;/* We don't use vmf->pgoff since that has the fake offset */ unsigned long vaddr = vmf->address; -int ret; +vm_fault_t ret =VM_FAULT_SIGBUS ;loff_t num_pages;pgoff_t page_offset; page_offset = (vaddr - vma->vm_start) >>PAGE_SHIFT ;@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)if (page_offset > num_pages)return VM_FAULT_SIGBUS ;Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/vgem/vgem_drv.c +0
-2- ret = -ENOENT ;mutex_lock (&obj->pages_lock);if (obj->pages) {get_page (obj->pages[page_offset]); --1.9.1
Any further comment on this patch ?
Quoted 2 lines
Patch looks good to me. My build test fails, though, since
vm_fault_tdoesn't exist in drm-misc-next yet.
vm_fault_tis already in upstream, just needs Maarten to do a backmerge. Which I think he's done by now ... Otherwise nag him more :-) -DanielQuoted 6 lines
So, for now,
Reviewed-by Sean Paul <[email protected]>Quoted 6 lines
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Daniel/ Sean, is this patch already merged for 4.18 ?
Nope, fell through the cracks. Thanks for the reminder, queued for 4.18 now.
-DanielDaniel, This patch is not available in 4.18-rc-1 :-)
I mixed up my book-keeping, it was queued for 4.19. Should show up in linux-next any day (well as soon as drm-misc maintainers get their book-keeping updated).
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel