[PATCH 1/3] drm: armada: fix armada_gem_vm_fault() to match new signature.

[PATCH 1/3] drm: armada: fix armada_gem_vm_fault() to match new signature.

[Liviu Dudau]

Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite
to take only vmf") changes the signature of the .fault hook. Update the
armada_gem_vm_fault() function to match.

Fixes: 25d3db7600b8 (mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf)
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Liviu Dudau <liviu@dudau.co.uk>
---
 drivers/gpu/drm/armada/armada_gem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index a293c8be232c..1ec0419003f3 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -14,8 +14,9 @@
 #include <drm/armada_drm.h>
 #include "armada_ioctlP.h"
 
-static int armada_gem_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int armada_gem_vm_fault(struct vm_fault *vmf)
 {
+	struct vm_area_struct *vma = vmf->vma;
 	struct armada_gem_object *obj = drm_to_armada_gem(vma->vm_private_data);
 	unsigned long pfn = obj->phys_addr >> PAGE_SHIFT;
 	int ret;
-- 
2.11.0

[PATCH 2/3] drm/etnaviv: Update etnaviv_gem_fault() declaration to match definition.

[Liviu Dudau]

Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite
to take only vmf") updated the etnaviv_gem_fault() function signature
without updating the header file with the declaration.

Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf")
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Liviu Dudau <liviu@dudau.co.uk>
---
 drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
index c255eda40526..e41f38667c1c 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
@@ -73,7 +73,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
 		struct drm_file *file);
 
 int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma);
-int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
+int etnaviv_gem_fault(struct vm_fault *vmf);
 int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset);
 struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj);
 void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj);
-- 
2.11.0

Re: [PATCH 2/3] drm/etnaviv: Update etnaviv_gem_fault() declaration to match definition.

[Lucas Stach]

Hi Liviu,

Am Dienstag, den 31.01.2017, 18:58 +0000 schrieb Liviu Dudau:
> Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite
> to take only vmf") updated the etnaviv_gem_fault() function signature
> without updating the header file with the declaration.
> 
There is already a patch from Arnd on the list that fixes this issue.

https://lkml.org/lkml/2017/1/25/718

Regards,
Lucas

> Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf")
> Cc: Dave Jiang <dave.jiang@intel.com>
> Cc: Lucas Stach <l.stach@pengutronix.de>
> Cc: Russell King <linux+etnaviv@armlinux.org.uk>
> Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
> Signed-off-by: Liviu Dudau <liviu@dudau.co.uk>
> ---
>  drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
> index c255eda40526..e41f38667c1c 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
> @@ -73,7 +73,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
>  		struct drm_file *file);
>  
>  int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma);
> -int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
> +int etnaviv_gem_fault(struct vm_fault *vmf);
>  int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset);
>  struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj);
>  void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj);

Re: [PATCH 2/3] drm/etnaviv: Update etnaviv_gem_fault() declaration to match definition.

[Liviu Dudau]

On Wed, Feb 01, 2017 at 10:26:08AM +0100, Lucas Stach wrote:
> Hi Liviu,
> 
> Am Dienstag, den 31.01.2017, 18:58 +0000 schrieb Liviu Dudau:
> > Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite
> > to take only vmf") updated the etnaviv_gem_fault() function signature
> > without updating the header file with the declaration.
> > 
> There is already a patch from Arnd on the list that fixes this issue.

Sorry, my search-fu was not strong enough. Thanks for pointing it out.

Best regards,
Liviu

> 
> https://lkml.org/lkml/2017/1/25/718
> 
> Regards,
> Lucas
> 
> > Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf")
> > Cc: Dave Jiang <dave.jiang@intel.com>
> > Cc: Lucas Stach <l.stach@pengutronix.de>
> > Cc: Russell King <linux+etnaviv@armlinux.org.uk>
> > Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
> > Signed-off-by: Liviu Dudau <liviu@dudau.co.uk>
> > ---
> >  drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
> > index c255eda40526..e41f38667c1c 100644
> > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h
> > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
> > @@ -73,7 +73,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
> >  		struct drm_file *file);
> >  
> >  int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma);
> > -int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
> > +int etnaviv_gem_fault(struct vm_fault *vmf);
> >  int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset);
> >  struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj);
> >  void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj);
> 
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯

[PATCH 3/3] drm/omapdrm: Update omap_gem_fault() declaration to match definition.

[Liviu Dudau]

Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite
to take only vmf") updated the omap_gem_fault() function signature without
updating the header file with the declaration.

Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf")
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Liviu Dudau <liviu@dudau.co.uk>
---
 drivers/gpu/drm/omapdrm/omap_drv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 36d93ce84a29..65977982f15f 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -188,7 +188,7 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 int omap_gem_mmap(struct file *filp, struct vm_area_struct *vma);
 int omap_gem_mmap_obj(struct drm_gem_object *obj,
 		struct vm_area_struct *vma);
-int omap_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
+int omap_gem_fault(struct vm_fault *vmf);
 int omap_gem_op_start(struct drm_gem_object *obj, enum omap_gem_op op);
 int omap_gem_op_finish(struct drm_gem_object *obj, enum omap_gem_op op);
 int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op);
-- 
2.11.0