[PATCH] drm/scheduler: fix build broken by "move last_sched fence updating prior to job popping"

[PATCH] drm/scheduler: fix build broken by "move last_sched fence updating prior to job popping"

[Christian König]

We don't have s_fence as local variable here.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/scheduler/gpu_scheduler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
index 5de79bbb12c8..f4b862503710 100644
--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
@@ -402,7 +402,7 @@ drm_sched_entity_pop_job(struct drm_sched_entity *entity)
 		dma_fence_set_error(&sched_job->s_fence->finished, -ECANCELED);
 
 	dma_fence_put(entity->last_scheduled);
-	entity->last_scheduled = dma_fence_get(&s_fence->finished);
+	entity->last_scheduled = dma_fence_get(&sched_job->s_fence->finished);
 
 	spsc_queue_pop(&entity->job_queue);
 	return sched_job;
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/scheduler: fix build broken by "move last_sched fence updating prior to job popping"

[Zhou, David(ChunMing)]

Reviewed-by: Chunming Zhou <david1.zhou@amd.com>

-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Christian K?nig
Sent: Wednesday, April 18, 2018 6:06 PM
To: amd-gfx@lists.freedesktop.org
Subject: [PATCH] drm/scheduler: fix build broken by "move last_sched fence updating prior to job popping"

We don't have s_fence as local variable here.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/scheduler/gpu_scheduler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
index 5de79bbb12c8..f4b862503710 100644
--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
@@ -402,7 +402,7 @@ drm_sched_entity_pop_job(struct drm_sched_entity *entity)
 		dma_fence_set_error(&sched_job->s_fence->finished, -ECANCELED);
 
 	dma_fence_put(entity->last_scheduled);
-	entity->last_scheduled = dma_fence_get(&s_fence->finished);
+	entity->last_scheduled = dma_fence_get(&sched_job->s_fence->finished);
 
 	spsc_queue_pop(&entity->job_queue);
 	return sched_job;
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/scheduler: fix build broken by "move last_sched fence updating prior to job popping"

[Michel Dänzer]

On 2018-04-18 12:06 PM, Christian König wrote:
> We don't have s_fence as local variable here.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
>  drivers/gpu/drm/scheduler/gpu_scheduler.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
> index 5de79bbb12c8..f4b862503710 100644
> --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
> +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
> @@ -402,7 +402,7 @@ drm_sched_entity_pop_job(struct drm_sched_entity *entity)
>  		dma_fence_set_error(&sched_job->s_fence->finished, -ECANCELED);
>  
>  	dma_fence_put(entity->last_scheduled);
> -	entity->last_scheduled = dma_fence_get(&s_fence->finished);
> +	entity->last_scheduled = dma_fence_get(&sched_job->s_fence->finished);
>  
>  	spsc_queue_pop(&entity->job_queue);
>  	return sched_job;
> 

There's no need to wait for a review before pushing such an obvious and
trivial fix for a compile failure.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/scheduler: fix build broken by "move last_sched fence updating prior to job popping"

[Huang Rui]

On Wed, Apr 18, 2018 at 12:06:27PM +0200, Christian König wrote:
> We don't have s_fence as local variable here.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>

I just also meet this issue, and file the patch. And found you already
fixed it.

Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/scheduler/gpu_scheduler.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
> index 5de79bbb12c8..f4b862503710 100644
> --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
> +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
> @@ -402,7 +402,7 @@ drm_sched_entity_pop_job(struct drm_sched_entity *entity)
>  		dma_fence_set_error(&sched_job->s_fence->finished, -ECANCELED);
>  
>  	dma_fence_put(entity->last_scheduled);
> -	entity->last_scheduled = dma_fence_get(&s_fence->finished);
> +	entity->last_scheduled = dma_fence_get(&sched_job->s_fence->finished);
>  
>  	spsc_queue_pop(&entity->job_queue);
>  	return sched_job;
> -- 
> 2.14.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx