[PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Boris Brezillon]

Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
pages_use_count") changed the type of
drm_gem_shmem_object::pages_use_count but accel drivers were left
behind.

Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
Cc: Oded Gabbay <ogabbay@kernel.org>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/accel/ivpu/ivpu_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
index 8741c73b92ce..09c9c5256af5 100644
--- a/drivers/accel/ivpu/ivpu_gem.c
+++ b/drivers/accel/ivpu/ivpu_gem.c
@@ -282,7 +282,7 @@ static void ivpu_gem_bo_free(struct drm_gem_object *obj)
 	ivpu_bo_unbind_locked(bo);
 	mutex_destroy(&bo->lock);
 
-	drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
+	drm_WARN_ON(obj->dev, refcount_read(&bo->base.pages_use_count) > 1);
 	drm_gem_shmem_free(&bo->base);
 }
 
-- 
2.48.1

[PATCH 2/3] accel/ivpu: s/drm_gem_shmem_v[un]map/drm_gem_shmem_v[un]map_locked/

[Boris Brezillon]

Commit 954907f7147d ("drm/shmem-helper: Refactor locked/unlocked
functions") suffixed drm_gem_shmem_v[un]map with _locked to reflect
the fact these functions must be called with the GEM resv lock held,
but accel drivers were left behind.

Fixes: 954907f7147d ("drm/shmem-helper: Refactor locked/unlocked functions")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
Cc: Oded Gabbay <ogabbay@kernel.org>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/accel/ivpu/ivpu_gem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
index 09c9c5256af5..212d21ad2bbd 100644
--- a/drivers/accel/ivpu/ivpu_gem.c
+++ b/drivers/accel/ivpu/ivpu_gem.c
@@ -362,7 +362,7 @@ ivpu_bo_create(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx,
 
 	if (flags & DRM_IVPU_BO_MAPPABLE) {
 		dma_resv_lock(bo->base.base.resv, NULL);
-		ret = drm_gem_shmem_vmap(&bo->base, &map);
+		ret = drm_gem_shmem_vmap_locked(&bo->base, &map);
 		dma_resv_unlock(bo->base.base.resv);
 
 		if (ret)
@@ -387,7 +387,7 @@ void ivpu_bo_free(struct ivpu_bo *bo)
 
 	if (bo->flags & DRM_IVPU_BO_MAPPABLE) {
 		dma_resv_lock(bo->base.base.resv, NULL);
-		drm_gem_shmem_vunmap(&bo->base, &map);
+		drm_gem_shmem_vunmap_locked(&bo->base, &map);
 		dma_resv_unlock(bo->base.base.resv);
 	}
 
-- 
2.48.1

[PATCH 3/3] accel/amdxdna: s/drm_gem_v[un]map_unlocked/drm_gem_v[un]map/

[Boris Brezillon]

Commit 8f5c4871a014 ("drm/gem: Change locked/unlocked postfix of
drm_gem_v/unmap() function names") dropped the _unlocked suffix,
but accel drivers were left behind.

Fixes: 8f5c4871a014 ("drm/gem: Change locked/unlocked postfix of drm_gem_v/unmap() function names")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: Min Ma <min.ma@amd.com>
Cc: Lizhi Hou <lizhi.hou@amd.com>
Cc: Oded Gabbay <ogabbay@kernel.org>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/accel/amdxdna/amdxdna_gem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/accel/amdxdna/amdxdna_gem.c b/drivers/accel/amdxdna/amdxdna_gem.c
index 606433d73236..d9691dca12d1 100644
--- a/drivers/accel/amdxdna/amdxdna_gem.c
+++ b/drivers/accel/amdxdna/amdxdna_gem.c
@@ -81,7 +81,7 @@ static void amdxdna_gem_obj_free(struct drm_gem_object *gobj)
 	if (abo->type == AMDXDNA_BO_DEV_HEAP)
 		drm_mm_takedown(&abo->mm);
 
-	drm_gem_vunmap_unlocked(gobj, &map);
+	drm_gem_vunmap(gobj, &map);
 	mutex_destroy(&abo->lock);
 	drm_gem_shmem_free(&abo->base);
 }
@@ -417,7 +417,7 @@ amdxdna_drm_create_cmd_bo(struct drm_device *dev,
 	abo->type = AMDXDNA_BO_CMD;
 	abo->client = filp->driver_priv;
 
-	ret = drm_gem_vmap_unlocked(to_gobj(abo), &map);
+	ret = drm_gem_vmap(to_gobj(abo), &map);
 	if (ret) {
 		XDNA_ERR(xdna, "Vmap cmd bo failed, ret %d", ret);
 		goto release_obj;
-- 
2.48.1

Re: [PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Dmitry Osipenko]

On 3/27/25 13:42, Boris Brezillon wrote:
> Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
> pages_use_count") changed the type of
> drm_gem_shmem_object::pages_use_count but accel drivers were left
> behind.
> 
> Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: dri-devel@lists.freedesktop.org
> ---
>  drivers/accel/ivpu/ivpu_gem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
> index 8741c73b92ce..09c9c5256af5 100644
> --- a/drivers/accel/ivpu/ivpu_gem.c
> +++ b/drivers/accel/ivpu/ivpu_gem.c
> @@ -282,7 +282,7 @@ static void ivpu_gem_bo_free(struct drm_gem_object *obj)
>  	ivpu_bo_unbind_locked(bo);
>  	mutex_destroy(&bo->lock);
>  
> -	drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
> +	drm_WARN_ON(obj->dev, refcount_read(&bo->base.pages_use_count) > 1);
>  	drm_gem_shmem_free(&bo->base);
>  }
>  

Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>

-- 
Best regards,
Dmitry

Re: [PATCH 2/3] accel/ivpu: s/drm_gem_shmem_v[un]map/drm_gem_shmem_v[un]map_locked/

[Dmitry Osipenko]

On 3/27/25 13:42, Boris Brezillon wrote:
> Commit 954907f7147d ("drm/shmem-helper: Refactor locked/unlocked
> functions") suffixed drm_gem_shmem_v[un]map with _locked to reflect
> the fact these functions must be called with the GEM resv lock held,
> but accel drivers were left behind.
> 
> Fixes: 954907f7147d ("drm/shmem-helper: Refactor locked/unlocked functions")
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: dri-devel@lists.freedesktop.org
> ---
>  drivers/accel/ivpu/ivpu_gem.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
> index 09c9c5256af5..212d21ad2bbd 100644
> --- a/drivers/accel/ivpu/ivpu_gem.c
> +++ b/drivers/accel/ivpu/ivpu_gem.c
> @@ -362,7 +362,7 @@ ivpu_bo_create(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx,
>  
>  	if (flags & DRM_IVPU_BO_MAPPABLE) {
>  		dma_resv_lock(bo->base.base.resv, NULL);
> -		ret = drm_gem_shmem_vmap(&bo->base, &map);
> +		ret = drm_gem_shmem_vmap_locked(&bo->base, &map);
>  		dma_resv_unlock(bo->base.base.resv);
>  
>  		if (ret)
> @@ -387,7 +387,7 @@ void ivpu_bo_free(struct ivpu_bo *bo)
>  
>  	if (bo->flags & DRM_IVPU_BO_MAPPABLE) {
>  		dma_resv_lock(bo->base.base.resv, NULL);
> -		drm_gem_shmem_vunmap(&bo->base, &map);
> +		drm_gem_shmem_vunmap_locked(&bo->base, &map);
>  		dma_resv_unlock(bo->base.base.resv);
>  	}
>  

Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>

-- 
Best regards,
Dmitry

Re: [PATCH 3/3] accel/amdxdna: s/drm_gem_v[un]map_unlocked/drm_gem_v[un]map/

[Dmitry Osipenko]

On 3/27/25 13:43, Boris Brezillon wrote:
> Commit 8f5c4871a014 ("drm/gem: Change locked/unlocked postfix of
> drm_gem_v/unmap() function names") dropped the _unlocked suffix,
> but accel drivers were left behind.
> 
> Fixes: 8f5c4871a014 ("drm/gem: Change locked/unlocked postfix of drm_gem_v/unmap() function names")
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Cc: Min Ma <min.ma@amd.com>
> Cc: Lizhi Hou <lizhi.hou@amd.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: dri-devel@lists.freedesktop.org
> ---
>  drivers/accel/amdxdna/amdxdna_gem.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/accel/amdxdna/amdxdna_gem.c b/drivers/accel/amdxdna/amdxdna_gem.c
> index 606433d73236..d9691dca12d1 100644
> --- a/drivers/accel/amdxdna/amdxdna_gem.c
> +++ b/drivers/accel/amdxdna/amdxdna_gem.c
> @@ -81,7 +81,7 @@ static void amdxdna_gem_obj_free(struct drm_gem_object *gobj)
>  	if (abo->type == AMDXDNA_BO_DEV_HEAP)
>  		drm_mm_takedown(&abo->mm);
>  
> -	drm_gem_vunmap_unlocked(gobj, &map);
> +	drm_gem_vunmap(gobj, &map);
>  	mutex_destroy(&abo->lock);
>  	drm_gem_shmem_free(&abo->base);
>  }
> @@ -417,7 +417,7 @@ amdxdna_drm_create_cmd_bo(struct drm_device *dev,
>  	abo->type = AMDXDNA_BO_CMD;
>  	abo->client = filp->driver_priv;
>  
> -	ret = drm_gem_vmap_unlocked(to_gobj(abo), &map);
> +	ret = drm_gem_vmap(to_gobj(abo), &map);
>  	if (ret) {
>  		XDNA_ERR(xdna, "Vmap cmd bo failed, ret %d", ret);
>  		goto release_obj;

Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>

-- 
Best regards,
Dmitry

Re: [PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Jani Nikula]

On Thu, 27 Mar 2025, Boris Brezillon <boris.brezillon@collabora.com> wrote:
> Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
> pages_use_count") changed the type of
> drm_gem_shmem_object::pages_use_count but accel drivers were left
> behind.
>
> Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
> Cc: Oded Gabbay <ogabbay@kernel.org>
> Cc: dri-devel@lists.freedesktop.org

Just for build, on the series,

Tested-by: Jani Nikula <jani.nikula@intel.com>

Please merge.

> ---
>  drivers/accel/ivpu/ivpu_gem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_gem.c b/drivers/accel/ivpu/ivpu_gem.c
> index 8741c73b92ce..09c9c5256af5 100644
> --- a/drivers/accel/ivpu/ivpu_gem.c
> +++ b/drivers/accel/ivpu/ivpu_gem.c
> @@ -282,7 +282,7 @@ static void ivpu_gem_bo_free(struct drm_gem_object *obj)
>  	ivpu_bo_unbind_locked(bo);
>  	mutex_destroy(&bo->lock);
>  
> -	drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
> +	drm_WARN_ON(obj->dev, refcount_read(&bo->base.pages_use_count) > 1);
>  	drm_gem_shmem_free(&bo->base);
>  }

-- 
Jani Nikula, Intel

Re: [PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Dmitry Osipenko]

On 3/27/25 14:30, Jani Nikula wrote:
> On Thu, 27 Mar 2025, Boris Brezillon <boris.brezillon@collabora.com> wrote:
>> Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
>> pages_use_count") changed the type of
>> drm_gem_shmem_object::pages_use_count but accel drivers were left
>> behind.
>>
>> Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
>> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
>> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
>> Cc: Oded Gabbay <ogabbay@kernel.org>
>> Cc: dri-devel@lists.freedesktop.org
> 
> Just for build, on the series,
> 
> Tested-by: Jani Nikula <jani.nikula@intel.com>
> 
> Please merge.

Applied to misc-next

-- 
Best regards,
Dmitry

Re: [PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Jacek Lawrynowicz]

Hi,

On 3/27/2025 12:37 PM, Dmitry Osipenko wrote:
> On 3/27/25 14:30, Jani Nikula wrote:
>> On Thu, 27 Mar 2025, Boris Brezillon <boris.brezillon@collabora.com> wrote:
>>> Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
>>> pages_use_count") changed the type of
>>> drm_gem_shmem_object::pages_use_count but accel drivers were left
>>> behind.
>>>
>>> Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
>>> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
>>> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>>> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>>> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
>>> Cc: Oded Gabbay <ogabbay@kernel.org>
>>> Cc: dri-devel@lists.freedesktop.org
>>
>> Just for build, on the series,
>>
>> Tested-by: Jani Nikula <jani.nikula@intel.com>
>>
>> Please merge.
> 
> Applied to misc-next

This was applied in less then an hour after posting for review without any testing (building is not testing).
I can't see how this is up to community standards.
I would prefer that patches for accel/ivpu were merged by ivpu maintainers.
At least give us time to review them. 

Regards,
Jacek

Re: [PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Jani Nikula]

On Thu, 27 Mar 2025, Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> wrote:
> Hi,
>
> On 3/27/2025 12:37 PM, Dmitry Osipenko wrote:
>> On 3/27/25 14:30, Jani Nikula wrote:
>>> On Thu, 27 Mar 2025, Boris Brezillon <boris.brezillon@collabora.com> wrote:
>>>> Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
>>>> pages_use_count") changed the type of
>>>> drm_gem_shmem_object::pages_use_count but accel drivers were left
>>>> behind.
>>>>
>>>> Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
>>>> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
>>>> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>>>> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>>>> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
>>>> Cc: Oded Gabbay <ogabbay@kernel.org>
>>>> Cc: dri-devel@lists.freedesktop.org
>>>
>>> Just for build, on the series,
>>>
>>> Tested-by: Jani Nikula <jani.nikula@intel.com>
>>>
>>> Please merge.
>> 
>> Applied to misc-next
>
> This was applied in less then an hour after posting for review without any testing (building is not testing).
> I can't see how this is up to community standards.
> I would prefer that patches for accel/ivpu were merged by ivpu maintainers.
> At least give us time to review them. 

I regret rushing Boris/Dmitry to merge. Sorry about that.

My only excuse is that the build was broken, and the changes were small
and mechanical, similar to what was done elsewhere to change the
interfaces.


BR,
Jani.

-- 
Jani Nikula, Intel

Re: [PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Dmitry Osipenko]

On 3/27/25 15:19, Jacek Lawrynowicz wrote:
> Hi,
> 
> On 3/27/2025 12:37 PM, Dmitry Osipenko wrote:
>> On 3/27/25 14:30, Jani Nikula wrote:
>>> On Thu, 27 Mar 2025, Boris Brezillon <boris.brezillon@collabora.com> wrote:
>>>> Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
>>>> pages_use_count") changed the type of
>>>> drm_gem_shmem_object::pages_use_count but accel drivers were left
>>>> behind.
>>>>
>>>> Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
>>>> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
>>>> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>>>> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>>>> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
>>>> Cc: Oded Gabbay <ogabbay@kernel.org>
>>>> Cc: dri-devel@lists.freedesktop.org
>>>
>>> Just for build, on the series,
>>>
>>> Tested-by: Jani Nikula <jani.nikula@intel.com>
>>>
>>> Please merge.
>>
>> Applied to misc-next
> 
> This was applied in less then an hour after posting for review without any testing (building is not testing).
> I can't see how this is up to community standards.
> I would prefer that patches for accel/ivpu were merged by ivpu maintainers.
> At least give us time to review them. 

Not the first time I'm forgetting about accle/, my bad. Maybe you could
add yourself as a reviewer to drm-shmem MAINTAINERS to not miss relevant
DRM code changes in future.

-- 
Best regards,
Dmitry

Re: [PATCH 1/3] accel/ivpu: pages_use_count is now a refcount_t

[Jacek Lawrynowicz]

Hi,

On 3/27/2025 1:32 PM, Jani Nikula wrote:
> On Thu, 27 Mar 2025, Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> wrote:
>> Hi,
>>
>> On 3/27/2025 12:37 PM, Dmitry Osipenko wrote:
>>> On 3/27/25 14:30, Jani Nikula wrote:
>>>> On Thu, 27 Mar 2025, Boris Brezillon <boris.brezillon@collabora.com> wrote:
>>>>> Commit 051b6646d36d ("drm/shmem-helper: Use refcount_t for
>>>>> pages_use_count") changed the type of
>>>>> drm_gem_shmem_object::pages_use_count but accel drivers were left
>>>>> behind.
>>>>>
>>>>> Fixes: 051b6646d36d ("drm/shmem-helper: Use refcount_t for pages_use_count")
>>>>> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
>>>>> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>>>>> Cc: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>>>>> Cc: Maciej Falkowski <maciej.falkowski@linux.intel.com>
>>>>> Cc: Oded Gabbay <ogabbay@kernel.org>
>>>>> Cc: dri-devel@lists.freedesktop.org
>>>>
>>>> Just for build, on the series,
>>>>
>>>> Tested-by: Jani Nikula <jani.nikula@intel.com>
>>>>
>>>> Please merge.
>>>
>>> Applied to misc-next
>>
>> This was applied in less then an hour after posting for review without any testing (building is not testing).
>> I can't see how this is up to community standards.
>> I would prefer that patches for accel/ivpu were merged by ivpu maintainers.
>> At least give us time to review them. 
> 
> I regret rushing Boris/Dmitry to merge. Sorry about that.
> 
> My only excuse is that the build was broken, and the changes were small
> and mechanical, similar to what was done elsewhere to change the
> interfaces.

I guess it OK as this doesn't happen too often and I would probably do the same :)

Regards,
Jacek