stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context
@ 2020-02-06 14:13 Boris Brezillon
  2020-02-06 15:11 ` Steven Price
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Boris Brezillon @ 2020-02-06 14:13 UTC (permalink / raw)
  To: Rob Herring, Tomeu Vizoso, Alyssa Rosenzweig, Steven Price, Robin Murphy
  Cc: dri-devel, Antonio Caggiano, Icecream95, Boris Brezillon, stable

We need to use the AS attached to the opened FD when dumping counters.

Reported-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Fixes: 7282f7645d06 ("drm/panfrost: Implement per FD address spaces")
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
 drivers/gpu/drm/panfrost/panfrost_mmu.c     |  7 ++++++-
 drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 11 ++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index 763cfca886a7..3107b0738e40 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -151,7 +151,12 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu)
 	as = mmu->as;
 	if (as >= 0) {
 		int en = atomic_inc_return(&mmu->as_count);
-		WARN_ON(en >= NUM_JOB_SLOTS);
+
+		/*
+		 * AS can be retained by active jobs or a perfcnt context,
+		 * hence the '+ 1' here.
+		 */
+		WARN_ON(en >= (NUM_JOB_SLOTS + 1));
 
 		list_move(&mmu->list, &pfdev->as_lru_list);
 		goto out;
diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
index 684820448be3..6913578d5aa7 100644
--- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
+++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
@@ -73,7 +73,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
 	struct panfrost_file_priv *user = file_priv->driver_priv;
 	struct panfrost_perfcnt *perfcnt = pfdev->perfcnt;
 	struct drm_gem_shmem_object *bo;
-	u32 cfg;
+	u32 cfg, as;
 	int ret;
 
 	if (user == perfcnt->user)
@@ -126,12 +126,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
 
 	perfcnt->user = user;
 
-	/*
-	 * Always use address space 0 for now.
-	 * FIXME: this needs to be updated when we start using different
-	 * address space.
-	 */
-	cfg = GPU_PERFCNT_CFG_AS(0) |
+	as = panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu);
+	cfg = GPU_PERFCNT_CFG_AS(as) |
 	      GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_MANUAL);
 
 	/*
@@ -195,6 +191,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,
 	drm_gem_shmem_vunmap(&perfcnt->mapping->obj->base.base, perfcnt->buf);
 	perfcnt->buf = NULL;
 	panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv);
+	panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu);
 	panfrost_gem_mapping_put(perfcnt->mapping);
 	perfcnt->mapping = NULL;
 	pm_runtime_mark_last_busy(pfdev->dev);
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context
  2020-02-06 14:13 [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context Boris Brezillon
@ 2020-02-06 15:11 ` Steven Price
  2020-02-07 17:39 ` Antonio Caggiano
  2020-02-12 20:32 ` Rob Herring
  2 siblings, 0 replies; 4+ messages in thread
From: Steven Price @ 2020-02-06 15:11 UTC (permalink / raw)
  To: Boris Brezillon, Rob Herring, Tomeu Vizoso, Alyssa Rosenzweig,
	Robin Murphy
  Cc: stable, Icecream95, Antonio Caggiano, dri-devel

On 06/02/2020 14:13, Boris Brezillon wrote:
> We need to use the AS attached to the opened FD when dumping counters.

Indeed we do!

Reviewed-by: Steven Price <steven.price@arm.com>

> 
> Reported-by: Antonio Caggiano <antonio.caggiano@collabora.com>
> Fixes: 7282f7645d06 ("drm/panfrost: Implement per FD address spaces")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
>  drivers/gpu/drm/panfrost/panfrost_mmu.c     |  7 ++++++-
>  drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 11 ++++-------
>  2 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index 763cfca886a7..3107b0738e40 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -151,7 +151,12 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu)
>  	as = mmu->as;
>  	if (as >= 0) {
>  		int en = atomic_inc_return(&mmu->as_count);
> -		WARN_ON(en >= NUM_JOB_SLOTS);
> +
> +		/*
> +		 * AS can be retained by active jobs or a perfcnt context,
> +		 * hence the '+ 1' here.
> +		 */
> +		WARN_ON(en >= (NUM_JOB_SLOTS + 1));
>  
>  		list_move(&mmu->list, &pfdev->as_lru_list);
>  		goto out;
> diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> index 684820448be3..6913578d5aa7 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> @@ -73,7 +73,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
>  	struct panfrost_file_priv *user = file_priv->driver_priv;
>  	struct panfrost_perfcnt *perfcnt = pfdev->perfcnt;
>  	struct drm_gem_shmem_object *bo;
> -	u32 cfg;
> +	u32 cfg, as;
>  	int ret;
>  
>  	if (user == perfcnt->user)
> @@ -126,12 +126,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
>  
>  	perfcnt->user = user;
>  
> -	/*
> -	 * Always use address space 0 for now.
> -	 * FIXME: this needs to be updated when we start using different
> -	 * address space.
> -	 */
> -	cfg = GPU_PERFCNT_CFG_AS(0) |
> +	as = panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu);
> +	cfg = GPU_PERFCNT_CFG_AS(as) |
>  	      GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_MANUAL);
>  
>  	/*
> @@ -195,6 +191,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,
>  	drm_gem_shmem_vunmap(&perfcnt->mapping->obj->base.base, perfcnt->buf);
>  	perfcnt->buf = NULL;
>  	panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv);
> +	panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu);
>  	panfrost_gem_mapping_put(perfcnt->mapping);
>  	perfcnt->mapping = NULL;
>  	pm_runtime_mark_last_busy(pfdev->dev);
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context
  2020-02-06 14:13 [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context Boris Brezillon
  2020-02-06 15:11 ` Steven Price
@ 2020-02-07 17:39 ` Antonio Caggiano
  2020-02-12 20:32 ` Rob Herring
  2 siblings, 0 replies; 4+ messages in thread
From: Antonio Caggiano @ 2020-02-07 17:39 UTC (permalink / raw)
  To: Boris Brezillon, Rob Herring, Tomeu Vizoso, Alyssa Rosenzweig,
	Steven Price, Robin Murphy
  Cc: dri-devel, Icecream95, stable

On 06/02/20 15:13, Boris Brezillon wrote:
> We need to use the AS attached to the opened FD when dumping counters.
> 
> Reported-by: Antonio Caggiano <antonio.caggiano@collabora.com>
> Fixes: 7282f7645d06 ("drm/panfrost: Implement per FD address spaces")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>

It works fine on RK3399.

Tested-by: Antonio Caggiano <antonio.caggiano@collabora.com>

> ---
>   drivers/gpu/drm/panfrost/panfrost_mmu.c     |  7 ++++++-
>   drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 11 ++++-------
>   2 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index 763cfca886a7..3107b0738e40 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -151,7 +151,12 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu *mmu)
>   	as = mmu->as;
>   	if (as >= 0) {
>   		int en = atomic_inc_return(&mmu->as_count);
> -		WARN_ON(en >= NUM_JOB_SLOTS);
> +
> +		/*
> +		 * AS can be retained by active jobs or a perfcnt context,
> +		 * hence the '+ 1' here.
> +		 */
> +		WARN_ON(en >= (NUM_JOB_SLOTS + 1));
>   
>   		list_move(&mmu->list, &pfdev->as_lru_list);
>   		goto out;
> diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> index 684820448be3..6913578d5aa7 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> @@ -73,7 +73,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
>   	struct panfrost_file_priv *user = file_priv->driver_priv;
>   	struct panfrost_perfcnt *perfcnt = pfdev->perfcnt;
>   	struct drm_gem_shmem_object *bo;
> -	u32 cfg;
> +	u32 cfg, as;
>   	int ret;
>   
>   	if (user == perfcnt->user)
> @@ -126,12 +126,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
>   
>   	perfcnt->user = user;
>   
> -	/*
> -	 * Always use address space 0 for now.
> -	 * FIXME: this needs to be updated when we start using different
> -	 * address space.
> -	 */
> -	cfg = GPU_PERFCNT_CFG_AS(0) |
> +	as = panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu);
> +	cfg = GPU_PERFCNT_CFG_AS(as) |
>   	      GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_MANUAL);
>   
>   	/*
> @@ -195,6 +191,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,
>   	drm_gem_shmem_vunmap(&perfcnt->mapping->obj->base.base, perfcnt->buf);
>   	perfcnt->buf = NULL;
>   	panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv);
> +	panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu);
>   	panfrost_gem_mapping_put(perfcnt->mapping);
>   	perfcnt->mapping = NULL;
>   	pm_runtime_mark_last_busy(pfdev->dev);
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context
  2020-02-06 14:13 [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context Boris Brezillon
  2020-02-06 15:11 ` Steven Price
  2020-02-07 17:39 ` Antonio Caggiano
@ 2020-02-12 20:32 ` Rob Herring
  2 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2020-02-12 20:32 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Tomeu Vizoso, Alyssa Rosenzweig, Steven Price, Robin Murphy,
	dri-devel, Antonio Caggiano, Icecream95, stable

On Thu, Feb 6, 2020 at 8:13 AM Boris Brezillon
<boris.brezillon@collabora.com> wrote:
>
> We need to use the AS attached to the opened FD when dumping counters.
>
> Reported-by: Antonio Caggiano <antonio.caggiano@collabora.com>
> Fixes: 7282f7645d06 ("drm/panfrost: Implement per FD address spaces")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
>  drivers/gpu/drm/panfrost/panfrost_mmu.c     |  7 ++++++-
>  drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 11 ++++-------
>  2 files changed, 10 insertions(+), 8 deletions(-)

Applied to drm-misc-fixes.

Rob

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-12 20:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-06 14:13 [PATCH] drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context Boris Brezillon
2020-02-06 15:11 ` Steven Price
2020-02-07 17:39 ` Antonio Caggiano
2020-02-12 20:32 ` Rob Herring

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).