From: Francois Dugast <francois.dugast@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH v1 06/10] drm-uapi/xe: Remove PMU from Xe till uapi is finalized
Date: Fri, 15 Dec 2023 15:50:46 +0000 [thread overview]
Message-ID: <20231215155050.7-7-francois.dugast@intel.com> (raw)
In-Reply-To: <20231215155050.7-1-francois.dugast@intel.com>
Align with commit ("drm/xe/pmu: Remove PMU from Xe till uapi is finalized")
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
include/drm-uapi/xe_drm.h | 40 ---------------------------------------
1 file changed, 40 deletions(-)
diff --git a/include/drm-uapi/xe_drm.h b/include/drm-uapi/xe_drm.h
index 8f09e9681..b1839df48 100644
--- a/include/drm-uapi/xe_drm.h
+++ b/include/drm-uapi/xe_drm.h
@@ -1074,46 +1074,6 @@ struct drm_xe_wait_user_fence {
/** @reserved: Reserved */
__u64 reserved[2];
};
-
-/**
- * DOC: XE PMU event config IDs
- *
- * Check 'man perf_event_open' to use the ID's DRM_XE_PMU_XXXX listed in xe_drm.h
- * in 'struct perf_event_attr' as part of perf_event_open syscall to read a
- * particular event.
- *
- * For example to open the DRMXE_PMU_RENDER_GROUP_BUSY(0):
- *
- * .. code-block:: C
- *
- * struct perf_event_attr attr;
- * long long count;
- * int cpu = 0;
- * int fd;
- *
- * memset(&attr, 0, sizeof(struct perf_event_attr));
- * attr.type = type; // eg: /sys/bus/event_source/devices/xe_0000_56_00.0/type
- * attr.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED;
- * attr.use_clockid = 1;
- * attr.clockid = CLOCK_MONOTONIC;
- * attr.config = DRM_XE_PMU_RENDER_GROUP_BUSY(0);
- *
- * fd = syscall(__NR_perf_event_open, &attr, -1, cpu, -1, 0);
- */
-
-/*
- * Top bits of every counter are GT id.
- */
-#define __DRM_XE_PMU_GT_SHIFT (56)
-
-#define ___DRM_XE_PMU_OTHER(gt, x) \
- (((__u64)(x)) | ((__u64)(gt) << __DRM_XE_PMU_GT_SHIFT))
-
-#define DRM_XE_PMU_RENDER_GROUP_BUSY(gt) ___DRM_XE_PMU_OTHER(gt, 0)
-#define DRM_XE_PMU_COPY_GROUP_BUSY(gt) ___DRM_XE_PMU_OTHER(gt, 1)
-#define DRM_XE_PMU_MEDIA_GROUP_BUSY(gt) ___DRM_XE_PMU_OTHER(gt, 2)
-#define DRM_XE_PMU_ANY_ENGINE_GROUP_BUSY(gt) ___DRM_XE_PMU_OTHER(gt, 3)
-
#if defined(__cplusplus)
}
#endif
--
2.34.1
next prev parent reply other threads:[~2023-12-15 15:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-15 15:50 [PATCH v1 00/10] uAPI Alignment - More cleanup before upstream Francois Dugast
2023-12-15 15:50 ` [PATCH v1 01/10] drm-uapi/xe: Align header with current kernel uAPI Francois Dugast
2023-12-15 15:50 ` [PATCH v1 02/10] drm-uapi/xe: add exec_queue_id member to drm_xe_wait_user_fence structure Francois Dugast
2023-12-15 15:50 ` [PATCH v1 03/10] drm-uapi/xe: Don't wait on user_fence during exec queue reset Francois Dugast
2023-12-15 15:50 ` [PATCH v1 04/10] drm-uapi/xe: Remove DRM_IOCTL_XE_EXEC_QUEUE_SET_PROPERTY Francois Dugast
2023-12-15 15:50 ` [PATCH v1 05/10] drm-uapi/xe: Remove DRM_XE_UFENCE_WAIT_MASK_* Francois Dugast
2023-12-15 15:50 ` Francois Dugast [this message]
2023-12-15 15:50 ` [PATCH v1 07/10] drm-uapi/xe: Ensure every uapi struct has drm_xe prefix Francois Dugast
2023-12-15 15:50 ` [PATCH v1 08/10] drm-uapi/xe: Remove sync binds Francois Dugast
2023-12-15 15:50 ` [PATCH v1 09/10] drm-uapi/xe: Update header after documentation updates Francois Dugast
2023-12-15 15:50 ` [PATCH v1 10/10] tests/intel/xe: Remove xe_uevent for now Francois Dugast
2023-12-15 15:56 ` [PATCH v1 00/10] uAPI Alignment - More cleanup before upstream Dixit, Ashutosh
2023-12-15 16:48 ` Rodrigo Vivi
2023-12-15 16:35 ` ✓ Fi.CI.BAT: success for uAPI Alignment - More cleanup before upstream (rev3) Patchwork
2023-12-15 16:59 ` ✗ CI.xeBAT: failure " Patchwork
2023-12-16 0:22 ` ✗ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231215155050.7-7-francois.dugast@intel.com \
--to=francois.dugast@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox