Commit 8169b209 authored by Ashutosh Dixit's avatar Ashutosh Dixit
Browse files

drm/xe/uapi: Rename xe perf layer as xe observation layer 



In Xe, the perf layer allows capture of HW counter streams. These HW
counters are generally performance related but don't have to be necessarily
so. Also, the name "perf" is a carryover from i915 and is not preferred.

Here we propose the name "observation" for this common layer which allows
capture of different types of these counter streams.

v2: Rename observability layer to observation layer (Lucas/Rodrigo)
v3: Rename sysctl file to "observation_paranoid" (Jose)

Fixes: 52c2e956 ("drm/xe/perf/uapi: "Perf" layer to support multiple perf counter stream types")
Fixes: fe8929bd ("drm/xe/perf/uapi: Add perf_stream_paranoid sysctl")
Acked-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Acked-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240703164801.2561423-1-ashutosh.dixit@intel.com
parent 627c961d

drivers/gpu/drm/xe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -96,10 +96,10 @@ xe-y += xe_bb.o \ 
	xe_mocs.o \

	xe_module.o \

	xe_oa.o \

	xe_observation.o \

	xe_pat.o \

	xe_pci.o \

	xe_pcode.o \

	xe_perf.o \

	xe_pm.o \

	xe_preempt_fence.o \

	xe_pt.o \

drivers/gpu/drm/xe/xe_device.c

+2 −2
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ 
#include "xe_memirq.h"

#include "xe_mmio.h"

#include "xe_module.h"

#include "xe_observation.h"

#include "xe_pat.h"

#include "xe_pcode.h"

#include "xe_perf.h"

#include "xe_pm.h"

#include "xe_query.h"

#include "xe_sriov.h"
@@ -142,7 +142,7 @@ static const struct drm_ioctl_desc xe_ioctls[] = { 
			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(XE_WAIT_USER_FENCE, xe_wait_user_fence_ioctl,

			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(XE_PERF, xe_perf_ioctl, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(XE_OBSERVATION, xe_observation_ioctl, DRM_RENDER_ALLOW),

};



static long xe_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

drivers/gpu/drm/xe/xe_device_types.h

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ struct xe_device { 
	/** @heci_gsc: graphics security controller */

	struct xe_heci_gsc heci_gsc;



	/** @oa: oa perf counter subsystem */

	/** @oa: oa observation subsystem */

	struct xe_oa oa;



	/** @needs_flr_on_fini: requests function-reset on fini */

drivers/gpu/drm/xe/xe_gt_types.h

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ struct xe_gt { 
		u8 instances_per_class[XE_ENGINE_CLASS_MAX];

	} user_engines;



	/** @oa: oa perf counter subsystem per gt info */

	/** @oa: oa observation subsystem per gt info */

	struct xe_oa_gt oa;

};

drivers/gpu/drm/xe/xe_module.c

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "xe_drv.h"

#include "xe_hw_fence.h"

#include "xe_pci.h"

#include "xe_perf.h"

#include "xe_observation.h"

#include "xe_sched_job.h"



struct xe_modparam xe_modparam = {
@@ -80,8 +80,8 @@ static const struct init_funcs init_funcs[] = { 
		.exit = xe_unregister_pci_driver,

	},

	{

		.init = xe_perf_sysctl_register,

		.exit = xe_perf_sysctl_unregister,

		.init = xe_observation_sysctl_register,

		.exit = xe_observation_sysctl_unregister,

	},

};