[PATCH 1/2] drm/scheduler: Rename cleanup functions.

Michel Dänzer michel at daenzer.net
Wed Jun 6 07:03:19 UTC 2018


On 2018-06-05 07:02 PM, Andrey Grodzovsky wrote:
> Everything in the flush code path (i.e. waiting for SW queue
> to become empty) names with *_flush()
> and everything in the release code path names *_fini()
> 
> This patch also effect the amdgpu and etnaviv drivers which
> use those functions.
> 
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
> Suggested-by: Christian König <christian.koenig at amd.com>

[...]

> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> index 23e73c2..3dff4d0 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> @@ -140,7 +140,7 @@ static void etnaviv_postclose(struct drm_device *dev, struct drm_file *file)
>  				gpu->lastctx = NULL;
>  			mutex_unlock(&gpu->lock);
>  
> -			drm_sched_entity_fini(&gpu->sched,
> +			drm_sched_entity_destroy(&gpu->sched,
>  					      &ctx->sched_entity[i]);
>  		}
>  	}

The drm-next tree for 4.18 has a new v3d driver, which also uses
drm_sched_entity_fini. Please either make sure to merge this change via
a tree which has the v3d driver, and fix it up as well, or don't do the
fini => destroy rename.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer


More information about the dri-devel mailing list