Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c49d8280 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

drm/amdgpu: Rename entity cleanup finctions. 



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

Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 180fc134

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -683,8 +683,8 @@ int amdgpu_ctx_ioctl(struct drm_device *dev, void *data, 
int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx, unsigned ring_id);



void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr);

void amdgpu_ctx_mgr_entity_cleanup(struct amdgpu_ctx_mgr *mgr);

void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr);

void amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr);

void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr);

drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c

+3 −3
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr) 
	idr_init(&mgr->ctx_handles);

}



void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)

void amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr)

{

	struct amdgpu_ctx *ctx;

	struct idr *idp;
@@ -473,7 +473,7 @@ void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr) 
	mutex_unlock(&mgr->lock);

}



void amdgpu_ctx_mgr_entity_cleanup(struct amdgpu_ctx_mgr *mgr)

void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)

{

	struct amdgpu_ctx *ctx;

	struct idr *idp;
@@ -506,7 +506,7 @@ void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr) 
	struct idr *idp;

	uint32_t id;



	amdgpu_ctx_mgr_entity_cleanup(mgr);

	amdgpu_ctx_mgr_entity_fini(mgr);



	idp = &mgr->ctx_handles;

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static int amdgpu_flush(struct file *f, fl_owner_t id) 
	struct drm_file *file_priv = f->private_data;

	struct amdgpu_fpriv *fpriv = file_priv->driver_priv;



	amdgpu_ctx_mgr_entity_fini(&fpriv->ctx_mgr);

	amdgpu_ctx_mgr_entity_flush(&fpriv->ctx_mgr);



	return 0;

}