diff mbox series

drm/i915: Wait for active retire before i915_active_fini()

Message ID 20230522124205.368-1-nirmoy.das@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Wait for active retire before i915_active_fini() | expand

Commit Message

Nirmoy Das May 22, 2023, 12:42 p.m. UTC
i915_active_fini() finalizes the debug object, which can occur before
the active retires and deactivates the debug object. Wait for one
final time before calling i915_active_fini();

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8311
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/i915/i915_vma.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Rodrigo Vivi May 22, 2023, 2:47 p.m. UTC | #1
On Mon, May 22, 2023 at 02:42:05PM +0200, Nirmoy Das wrote:
> i915_active_fini() finalizes the debug object, which can occur before
> the active retires and deactivates the debug object. Wait for one
> final time before calling i915_active_fini();
> 
> References: https://gitlab.freedesktop.org/drm/intel/-/issues/8311
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>


Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>


> ---
>  drivers/gpu/drm/i915/i915_vma.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index 20a44788999e..bad698bece27 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -1710,6 +1710,8 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt,
>  	if (vm_ddestroy)
>  		i915_vm_resv_put(vma->vm);
>  
> +	/* Wait for async active retire */
> +	i915_active_wait(&vma->active);
>  	i915_active_fini(&vma->active);
>  	GEM_WARN_ON(vma->resource);
>  	i915_vma_free(vma);
> -- 
> 2.39.0
>
Andi Shyti May 22, 2023, 2:56 p.m. UTC | #2
Hi Nirmoy,

On Mon, May 22, 2023 at 02:42:05PM +0200, Nirmoy Das wrote:
> i915_active_fini() finalizes the debug object, which can occur before
> the active retires and deactivates the debug object. Wait for one
> final time before calling i915_active_fini();
> 
> References: https://gitlab.freedesktop.org/drm/intel/-/issues/8311
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>

does this need the Fixes: tag?

Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> 

Andi
Andrzej Hajda May 22, 2023, 3:23 p.m. UTC | #3
On 22.05.2023 14:42, Nirmoy Das wrote:
> i915_active_fini() finalizes the debug object, which can occur before
> the active retires and deactivates the debug object. Wait for one
> final time before calling i915_active_fini();
>
> References: https://gitlab.freedesktop.org/drm/intel/-/issues/8311
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>

Regards
Andrzej

> ---
>   drivers/gpu/drm/i915/i915_vma.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index 20a44788999e..bad698bece27 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -1710,6 +1710,8 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt,
>   	if (vm_ddestroy)
>   		i915_vm_resv_put(vma->vm);
>   
> +	/* Wait for async active retire */
> +	i915_active_wait(&vma->active);
>   	i915_active_fini(&vma->active);
>   	GEM_WARN_ON(vma->resource);
>   	i915_vma_free(vma);
Nirmoy Das May 22, 2023, 5:35 p.m. UTC | #4
Hi Andi,

On 5/22/2023 4:56 PM, Andi Shyti wrote:
> Hi Nirmoy,
>
> On Mon, May 22, 2023 at 02:42:05PM +0200, Nirmoy Das wrote:
>> i915_active_fini() finalizes the debug object, which can occur before
>> the active retires and deactivates the debug object. Wait for one
>> final time before calling i915_active_fini();
>>
>> References: https://gitlab.freedesktop.org/drm/intel/-/issues/8311
>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> does this need the Fixes: tag?


I can't pinpoint anything with a git blame also this is masked by

https://gitlab.freedesktop.org/drm/intel/-/issues/6733.

>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>


Thanks,

Nirmoy

>
> Andi
Nirmoy Das May 23, 2023, 5:49 p.m. UTC | #5
pushed to drm-intel-next with a minor fix (s/References:/Closes:)

On 5/22/2023 2:42 PM, Nirmoy Das wrote:
> i915_active_fini() finalizes the debug object, which can occur before
> the active retires and deactivates the debug object. Wait for one
> final time before calling i915_active_fini();
>
> References: https://gitlab.freedesktop.org/drm/intel/-/issues/8311
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_vma.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index 20a44788999e..bad698bece27 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -1710,6 +1710,8 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt,
>   	if (vm_ddestroy)
>   		i915_vm_resv_put(vma->vm);
>   
> +	/* Wait for async active retire */
> +	i915_active_wait(&vma->active);
>   	i915_active_fini(&vma->active);
>   	GEM_WARN_ON(vma->resource);
>   	i915_vma_free(vma);
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 20a44788999e..bad698bece27 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1710,6 +1710,8 @@  static void release_references(struct i915_vma *vma, struct intel_gt *gt,
 	if (vm_ddestroy)
 		i915_vm_resv_put(vma->vm);
 
+	/* Wait for async active retire */
+	i915_active_wait(&vma->active);
 	i915_active_fini(&vma->active);
 	GEM_WARN_ON(vma->resource);
 	i915_vma_free(vma);