dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/gem: fix build for mm_get_unmapped_area() call after backmerge
@ 2025-12-15  9:27 Jani Nikula
  2025-12-15  9:36 ` Francois Dugast
  2025-12-15  9:50 ` Nilawar, Badal
  0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2025-12-15  9:27 UTC (permalink / raw)
  To: dri-devel; +Cc: intel-xe, jani.nikula, Maxime Ripard

Commit 9ac09bb9feac ("mm: consistently use current->mm in
mm_get_unmapped_area()") upstream dropped a parameter from
mm_get_unmapped_area() while commit 99bda20d6d4c ("drm/gem: Introduce
drm_gem_get_unmapped_area() fop") in drm-misc-next added a new user.

Drop the extra parameter from the call.

Fixes: 7f790dd21a93 ("Merge drm/drm-next into drm-misc-next")
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_gem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index bcc08a6aebf8..28d6792112be 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -1303,8 +1303,7 @@ unsigned long drm_gem_get_unmapped_area(struct file *filp, unsigned long uaddr,
 
 	obj = drm_gem_object_lookup_at_offset(filp, pgoff, len >> PAGE_SHIFT);
 	if (IS_ERR(obj) || !obj->filp || !obj->filp->f_op->get_unmapped_area)
-		return mm_get_unmapped_area(current->mm, filp, uaddr, len, 0,
-					    flags);
+		return mm_get_unmapped_area(filp, uaddr, len, 0, flags);
 
 	ret = obj->filp->f_op->get_unmapped_area(obj->filp, uaddr, len, 0,
 						 flags);
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] drm/gem: fix build for mm_get_unmapped_area() call after backmerge
  2025-12-15  9:27 [PATCH] drm/gem: fix build for mm_get_unmapped_area() call after backmerge Jani Nikula
@ 2025-12-15  9:36 ` Francois Dugast
  2025-12-15 10:40   ` Jani Nikula
  2025-12-15  9:50 ` Nilawar, Badal
  1 sibling, 1 reply; 4+ messages in thread
From: Francois Dugast @ 2025-12-15  9:36 UTC (permalink / raw)
  To: Jani Nikula; +Cc: dri-devel, intel-xe, Maxime Ripard

On Mon, Dec 15, 2025 at 11:27:06AM +0200, Jani Nikula wrote:
> Commit 9ac09bb9feac ("mm: consistently use current->mm in
> mm_get_unmapped_area()") upstream dropped a parameter from
> mm_get_unmapped_area() while commit 99bda20d6d4c ("drm/gem: Introduce
> drm_gem_get_unmapped_area() fop") in drm-misc-next added a new user.
> 
> Drop the extra parameter from the call.
> 
> Fixes: 7f790dd21a93 ("Merge drm/drm-next into drm-misc-next")
> Cc: Maxime Ripard <mripard@kernel.org>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Francois Dugast <francois.dugast@intel.com>

> ---
>  drivers/gpu/drm/drm_gem.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index bcc08a6aebf8..28d6792112be 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -1303,8 +1303,7 @@ unsigned long drm_gem_get_unmapped_area(struct file *filp, unsigned long uaddr,
>  
>  	obj = drm_gem_object_lookup_at_offset(filp, pgoff, len >> PAGE_SHIFT);
>  	if (IS_ERR(obj) || !obj->filp || !obj->filp->f_op->get_unmapped_area)
> -		return mm_get_unmapped_area(current->mm, filp, uaddr, len, 0,
> -					    flags);
> +		return mm_get_unmapped_area(filp, uaddr, len, 0, flags);
>  
>  	ret = obj->filp->f_op->get_unmapped_area(obj->filp, uaddr, len, 0,
>  						 flags);
> -- 
> 2.47.3
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] drm/gem: fix build for mm_get_unmapped_area() call after backmerge
  2025-12-15  9:27 [PATCH] drm/gem: fix build for mm_get_unmapped_area() call after backmerge Jani Nikula
  2025-12-15  9:36 ` Francois Dugast
@ 2025-12-15  9:50 ` Nilawar, Badal
  1 sibling, 0 replies; 4+ messages in thread
From: Nilawar, Badal @ 2025-12-15  9:50 UTC (permalink / raw)
  To: Jani Nikula, dri-devel; +Cc: intel-xe, Maxime Ripard


On 15-12-2025 14:57, Jani Nikula wrote:
> Commit 9ac09bb9feac ("mm: consistently use current->mm in
> mm_get_unmapped_area()") upstream dropped a parameter from
> mm_get_unmapped_area() while commit 99bda20d6d4c ("drm/gem: Introduce
> drm_gem_get_unmapped_area() fop") in drm-misc-next added a new user.
>
> Drop the extra parameter from the call.
>
> Fixes: 7f790dd21a93 ("Merge drm/drm-next into drm-misc-next")
> Cc: Maxime Ripard <mripard@kernel.org>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>   drivers/gpu/drm/drm_gem.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index bcc08a6aebf8..28d6792112be 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -1303,8 +1303,7 @@ unsigned long drm_gem_get_unmapped_area(struct file *filp, unsigned long uaddr,
>   
>   	obj = drm_gem_object_lookup_at_offset(filp, pgoff, len >> PAGE_SHIFT);
>   	if (IS_ERR(obj) || !obj->filp || !obj->filp->f_op->get_unmapped_area)
> -		return mm_get_unmapped_area(current->mm, filp, uaddr, len, 0,
> -					    flags);
> +		return mm_get_unmapped_area(filp, uaddr, len, 0, flags);
Reviewed-by: Badal Nilawar <badal.nilawar@intel.com>
>   
>   	ret = obj->filp->f_op->get_unmapped_area(obj->filp, uaddr, len, 0,
>   						 flags);

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] drm/gem: fix build for mm_get_unmapped_area() call after backmerge
  2025-12-15  9:36 ` Francois Dugast
@ 2025-12-15 10:40   ` Jani Nikula
  0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2025-12-15 10:40 UTC (permalink / raw)
  To: Francois Dugast; +Cc: dri-devel, intel-xe, Maxime Ripard

On Mon, 15 Dec 2025, Francois Dugast <francois.dugast@intel.com> wrote:
> On Mon, Dec 15, 2025 at 11:27:06AM +0200, Jani Nikula wrote:
>> Commit 9ac09bb9feac ("mm: consistently use current->mm in
>> mm_get_unmapped_area()") upstream dropped a parameter from
>> mm_get_unmapped_area() while commit 99bda20d6d4c ("drm/gem: Introduce
>> drm_gem_get_unmapped_area() fop") in drm-misc-next added a new user.
>> 
>> Drop the extra parameter from the call.
>> 
>> Fixes: 7f790dd21a93 ("Merge drm/drm-next into drm-misc-next")
>> Cc: Maxime Ripard <mripard@kernel.org>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Francois Dugast <francois.dugast@intel.com>

Thanks, pushed to drm-misc-next.

BR,
Jani.

>
>> ---
>>  drivers/gpu/drm/drm_gem.c | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
>> index bcc08a6aebf8..28d6792112be 100644
>> --- a/drivers/gpu/drm/drm_gem.c
>> +++ b/drivers/gpu/drm/drm_gem.c
>> @@ -1303,8 +1303,7 @@ unsigned long drm_gem_get_unmapped_area(struct file *filp, unsigned long uaddr,
>>  
>>  	obj = drm_gem_object_lookup_at_offset(filp, pgoff, len >> PAGE_SHIFT);
>>  	if (IS_ERR(obj) || !obj->filp || !obj->filp->f_op->get_unmapped_area)
>> -		return mm_get_unmapped_area(current->mm, filp, uaddr, len, 0,
>> -					    flags);
>> +		return mm_get_unmapped_area(filp, uaddr, len, 0, flags);
>>  
>>  	ret = obj->filp->f_op->get_unmapped_area(obj->filp, uaddr, len, 0,
>>  						 flags);
>> -- 
>> 2.47.3
>> 

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-12-15 10:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-15  9:27 [PATCH] drm/gem: fix build for mm_get_unmapped_area() call after backmerge Jani Nikula
2025-12-15  9:36 ` Francois Dugast
2025-12-15 10:40   ` Jani Nikula
2025-12-15  9:50 ` Nilawar, Badal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).