Unverified Commit c6eabbab authored by Christian Gmeiner's avatar Christian Gmeiner Committed by Maíra Canal
Browse files

drm/v3d: Add DRM_IOCTL_V3D_PERFMON_SET_GLOBAL 



Add a new ioctl, DRM_IOCTL_V3D_PERFMON_SET_GLOBAL, to allow
configuration of a global performance monitor (perfmon).
Use the global perfmon for all jobs to ensure consistent
performance tracking across submissions. This feature is
needed to implement a Perfetto datasources in user-space.

Signed-off-by: default avatarChristian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: default avatarMaíra Canal <mcanal@igalia.com>
Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241202140615.74802-1-christian.gmeiner@gmail.com
parent f3c03be1

drivers/gpu/drm/v3d/v3d_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static const struct drm_ioctl_desc v3d_drm_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(V3D_PERFMON_GET_VALUES, v3d_perfmon_get_values_ioctl, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(V3D_SUBMIT_CPU, v3d_submit_cpu_ioctl, DRM_RENDER_ALLOW | DRM_AUTH),

	DRM_IOCTL_DEF_DRV(V3D_PERFMON_GET_COUNTER, v3d_perfmon_get_counter_ioctl, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(V3D_PERFMON_SET_GLOBAL, v3d_perfmon_set_global_ioctl, DRM_RENDER_ALLOW),

};



static const struct drm_driver v3d_drm_driver = {

drivers/gpu/drm/v3d/v3d_drv.h

+8 −0
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ struct v3d_dev { 
		u32 num_allocated;

		u32 pages_allocated;

	} bo_stats;



	/* To support a performance analysis tool in user space, we require

	 * a single, globally configured performance monitor (perfmon) for

	 * all jobs.

	 */

	struct v3d_perfmon *global_perfmon;

};



static inline struct v3d_dev *
@@ -594,6 +600,8 @@ int v3d_perfmon_get_values_ioctl(struct drm_device *dev, void *data, 
				 struct drm_file *file_priv);

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

				  struct drm_file *file_priv);

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

				 struct drm_file *file_priv);



/* v3d_sysfs.c */

int v3d_sysfs_init(struct device *dev);

drivers/gpu/drm/v3d/v3d_perfmon.c

+37 −0
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ static int v3d_perfmon_idr_del(int id, void *elem, void *data) 
	if (perfmon == v3d->active_perfmon)

		v3d_perfmon_stop(v3d, perfmon, false);



	/* If the global perfmon is being destroyed, set it to NULL */

	cmpxchg(&v3d->global_perfmon, perfmon, NULL);



	v3d_perfmon_put(perfmon);



	return 0;
@@ -398,6 +401,9 @@ int v3d_perfmon_destroy_ioctl(struct drm_device *dev, void *data, 
	if (perfmon == v3d->active_perfmon)

		v3d_perfmon_stop(v3d, perfmon, false);



	/* If the global perfmon is being destroyed, set it to NULL */

	cmpxchg(&v3d->global_perfmon, perfmon, NULL);



	v3d_perfmon_put(perfmon);



	return 0;
@@ -457,3 +463,34 @@ int v3d_perfmon_get_counter_ioctl(struct drm_device *dev, void *data, 


	return 0;

}



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

				 struct drm_file *file_priv)

{

	struct v3d_file_priv *v3d_priv = file_priv->driver_priv;

	struct drm_v3d_perfmon_set_global *req = data;

	struct v3d_dev *v3d = to_v3d_dev(dev);

	struct v3d_perfmon *perfmon;



	if (req->flags & ~DRM_V3D_PERFMON_CLEAR_GLOBAL)

		return -EINVAL;



	perfmon = v3d_perfmon_find(v3d_priv, req->id);

	if (!perfmon)

		return -EINVAL;



	/* If the request is to clear the global performance monitor */

	if (req->flags & DRM_V3D_PERFMON_CLEAR_GLOBAL) {

		if (!v3d->global_perfmon)

			return -EINVAL;



		xchg(&v3d->global_perfmon, NULL);



		return 0;

	}



	if (cmpxchg(&v3d->global_perfmon, NULL, perfmon))

		return -EBUSY;



	return 0;

}

drivers/gpu/drm/v3d/v3d_sched.c

+11 −3
Original line number Diff line number Diff line
@@ -120,11 +120,19 @@ v3d_cpu_job_free(struct drm_sched_job *sched_job) 
static void

v3d_switch_perfmon(struct v3d_dev *v3d, struct v3d_job *job)

{

	if (job->perfmon != v3d->active_perfmon)

	struct v3d_perfmon *perfmon = v3d->global_perfmon;



	if (!perfmon)

		perfmon = job->perfmon;



	if (perfmon == v3d->active_perfmon)

		return;



	if (perfmon != v3d->active_perfmon)

		v3d_perfmon_stop(v3d, v3d->active_perfmon, true);



	if (job->perfmon && v3d->active_perfmon != job->perfmon)

		v3d_perfmon_start(v3d, job->perfmon);

	if (perfmon && v3d->active_perfmon != perfmon)

		v3d_perfmon_start(v3d, perfmon);

}



static void

drivers/gpu/drm/v3d/v3d_submit.c

+10 −0
Original line number Diff line number Diff line
@@ -981,6 +981,11 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, 
		goto fail;



	if (args->perfmon_id) {

		if (v3d->global_perfmon) {

			ret = -EAGAIN;

			goto fail_perfmon;

		}



		render->base.perfmon = v3d_perfmon_find(v3d_priv,

							args->perfmon_id);
@@ -1196,6 +1201,11 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, 
		goto fail;



	if (args->perfmon_id) {

		if (v3d->global_perfmon) {

			ret = -EAGAIN;

			goto fail_perfmon;

		}



		job->base.perfmon = v3d_perfmon_find(v3d_priv,

						     args->perfmon_id);

		if (!job->base.perfmon) {