Commit 8678c8b3 authored by Qiang Yu's avatar Qiang Yu
Browse files

Revert "drm/lima: add usage counting method to ctx_mgr" 



This reverts commit bccafec9.

This is due to the depend commit has been reverted on upstream:
commit baad1097 ("Revert "drm/scheduler: track GPU active time per entity"")

Acked-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarQiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230404002601.24136-4-yq882255@163.com
parent 4ad17bf5

drivers/gpu/drm/lima/lima_ctx.c

+1 −29
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id) 
	if (!ctx)

		return -ENOMEM;

	ctx->dev = dev;

	ctx->mgr = mgr;

	kref_init(&ctx->refcnt);



	for (i = 0; i < lima_pipe_num; i++) {
@@ -43,17 +42,10 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id) 
static void lima_ctx_do_release(struct kref *ref)

{

	struct lima_ctx *ctx = container_of(ref, struct lima_ctx, refcnt);

	struct lima_ctx_mgr *mgr = ctx->mgr;

	int i;



	for (i = 0; i < lima_pipe_num; i++) {

		struct lima_sched_context *context = &ctx->context[i];

		struct drm_sched_entity *entity = &context->base;



		mgr->elapsed_ns[i] += entity->elapsed_ns;



	for (i = 0; i < lima_pipe_num; i++)

		lima_sched_context_fini(ctx->dev->pipe + i, ctx->context + i);

	}

	kfree(ctx);

}
@@ -107,23 +99,3 @@ void lima_ctx_mgr_fini(struct lima_ctx_mgr *mgr) 
	xa_destroy(&mgr->handles);

	mutex_destroy(&mgr->lock);

}
 


void lima_ctx_mgr_usage(struct lima_ctx_mgr *mgr, u64 usage[lima_pipe_num])

{

	struct lima_ctx *ctx;

	unsigned long id;



	for (int i = 0; i < lima_pipe_num; i++)

		usage[i] = mgr->elapsed_ns[i];



	mutex_lock(&mgr->lock);

	xa_for_each(&mgr->handles, id, ctx) {

		for (int i = 0; i < lima_pipe_num; i++) {

			struct lima_sched_context *context = &ctx->context[i];

			struct drm_sched_entity *entity = &context->base;



			usage[i] += entity->elapsed_ns;

		}

	}

	mutex_unlock(&mgr->lock);

}

drivers/gpu/drm/lima/lima_ctx.h

+0 −3
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
struct lima_ctx {

	struct kref refcnt;

	struct lima_device *dev;

	struct lima_ctx_mgr *mgr;

	struct lima_sched_context context[lima_pipe_num];

	atomic_t guilty;
@@ -24,7 +23,6 @@ struct lima_ctx { 
struct lima_ctx_mgr {

	struct mutex lock;

	struct xarray handles;

	u64 elapsed_ns[lima_pipe_num];

};



int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id);
@@ -33,6 +31,5 @@ struct lima_ctx *lima_ctx_get(struct lima_ctx_mgr *mgr, u32 id); 
void lima_ctx_put(struct lima_ctx *ctx);

void lima_ctx_mgr_init(struct lima_ctx_mgr *mgr);

void lima_ctx_mgr_fini(struct lima_ctx_mgr *mgr);

void lima_ctx_mgr_usage(struct lima_ctx_mgr *mgr, u64 usage[lima_pipe_num]);



#endif