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

Commit efd4ccb5 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup ctx_mgr init/fini 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
parent 34cb581a

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

+2 −2
Original line number Diff line number Diff line
@@ -1038,8 +1038,6 @@ int amdgpu_ctx_alloc(struct amdgpu_device *adev, struct amdgpu_fpriv *fpriv, 
int amdgpu_ctx_free(struct amdgpu_device *adev, struct amdgpu_fpriv *fpriv,

		    uint32_t id);



void amdgpu_ctx_fini(struct amdgpu_fpriv *fpriv);



struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id);

int amdgpu_ctx_put(struct amdgpu_ctx *ctx);
@@ -1051,6 +1049,8 @@ struct fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx, 
int amdgpu_ctx_ioctl(struct drm_device *dev, void *data,

		     struct drm_file *filp);



void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr);

void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr);



/*

 * file private structure

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

+23 −17
Original line number Diff line number Diff line
@@ -182,23 +182,6 @@ static int amdgpu_ctx_query(struct amdgpu_device *adev, 
	return 0;

}



void amdgpu_ctx_fini(struct amdgpu_fpriv *fpriv)

{

	struct idr *idp;

	struct amdgpu_ctx *ctx;

	uint32_t id;

	struct amdgpu_ctx_mgr *mgr = &fpriv->ctx_mgr;

	idp = &mgr->ctx_handles;



	idr_for_each_entry(idp,ctx,id) {

		if (kref_put(&ctx->refcount, amdgpu_ctx_do_release) != 1)

			DRM_ERROR("ctx %p is still alive\n", ctx);

	}



	idr_destroy(&mgr->ctx_handles);

	mutex_destroy(&mgr->lock);

}



int amdgpu_ctx_ioctl(struct drm_device *dev, void *data,

		     struct drm_file *filp)

{
@@ -330,3 +313,26 @@ struct fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx, 


	return fence;

}



void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr)

{

	mutex_init(&mgr->lock);

	idr_init(&mgr->ctx_handles);

}



void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr)

{

	struct amdgpu_ctx *ctx;

	struct idr *idp;

	uint32_t id;



	idp = &mgr->ctx_handles;



	idr_for_each_entry(idp, ctx, id) {

		if (kref_put(&ctx->refcount, amdgpu_ctx_do_release) != 1)

			DRM_ERROR("ctx %p is still alive\n", ctx);

	}



	idr_destroy(&mgr->ctx_handles);

	mutex_destroy(&mgr->lock);

}

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

+2 −6
Original line number Diff line number Diff line
@@ -527,10 +527,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
	mutex_init(&fpriv->bo_list_lock);

	idr_init(&fpriv->bo_list_handles);



	/* init context manager */

	mutex_init(&fpriv->ctx_mgr.lock);

	idr_init(&fpriv->ctx_mgr.ctx_handles);

	fpriv->ctx_mgr.adev = adev;

	amdgpu_ctx_mgr_init(&fpriv->ctx_mgr);



	file_priv->driver_priv = fpriv;
@@ -571,8 +568,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 
	idr_destroy(&fpriv->bo_list_handles);

	mutex_destroy(&fpriv->bo_list_lock);



	/* release context */

	amdgpu_ctx_fini(fpriv);

	amdgpu_ctx_mgr_fini(&fpriv->ctx_mgr);



	kfree(fpriv);

	file_priv->driver_priv = NULL;