drm/xe/pmu: Remove PMU from Xe till uapi is finalized
Subsystems (3)
PATCH 1/1 drm/xe/pmu: Remove PMU from Xe till uapi is finalized
PMU uapi is likely to change in the future. Till the uapi is finalized, remove PMU from Xe. PMU can be re-added after uapi is finalized.
Signed-off-by Ashutosh Dixit <[email protected]>
--- drivers/gpu/drm/xe/Makefile | 2 - drivers/gpu/drm/xe/regs/xe_gt_regs.h | 5 - drivers/gpu/drm/xe/xe_device.c | 2 - drivers/gpu/drm/xe/xe_device_types.h | 4 - drivers/gpu/drm/xe/xe_gt.c | 2 - drivers/gpu/drm/xe/xe_module.c | 5 - drivers/gpu/drm/xe/xe_pmu.c | 645 --------------------------- drivers/gpu/drm/xe/xe_pmu.h | 25 -- drivers/gpu/drm/xe/xe_pmu_types.h | 68 --- include/uapi/drm/xe_drm.h | 40 -- 10 files changed, 798 deletions(-) delete mode 100644 drivers/gpu/drm/xe/xe_pmu.c delete mode 100644 drivers/gpu/drm/xe/xe_pmu.h delete mode 100644 drivers/gpu/drm/xe/xe_pmu_types.h
drivers/gpu/drm/xe/Makefile +0 -2
@@ -267,8 +267,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ i915-display/skl_universal_plane.o \ i915-display/skl_watermark.o -xe-$(CONFIG_PERF_EVENTS) += xe_pmu.o - ifeq ($(CONFIG_ACPI),y) xe-$(CONFIG_DRM_XE_DISPLAY) += \ i915-display/intel_acpi.o \
drivers/gpu/drm/xe/regs/xe_gt_regs.h +0 -5
@@ -330,11 +330,6 @@#define INVALIDATION_BROADCAST_MODE_DIS REG_BIT(12)#define GLOBAL_INVALIDATION_MODE REG_BIT(2) -#define XE_OAG_RC0_ANY_ENGINE_BUSY_FREE XE_REG(0xdb80) -#define XE_OAG_ANY_MEDIA_FF_BUSY_FREE XE_REG(0xdba0) -#define XE_OAG_BLT_BUSY_FREE XE_REG(0xdbbc) -#define XE_OAG_RENDER_BUSY_FREE XE_REG(0xdbdc) -#define HALF_SLICE_CHICKEN5 XE_REG_MCR(0xe188, XE_REG_OPTION_MASKED)#define DISABLE_SAMPLE_G_PERFORMANCE REG_BIT(0)
drivers/gpu/drm/xe/xe_device.c +0 -2
@@ -499,8 +499,6 @@ int xe_device_probe(struct xe_device *xe)xe_debugfs_register (xe); -xe_pmu_register (&xe->pmu); -xe_hwmon_register (xe); err =drmm_add_action_or_reset (&xe->drm, xe_device_sanitize, xe);
drivers/gpu/drm/xe/xe_device_types.h +0 -4
@@ -18,7 +18,6 @@#include "xe_lmtt_types.h" #include "xe_platform_types.h" #include "xe_pt_types.h" -#include "xe_pmu.h" #include "xe_sriov_types.h" #include "xe_step_types.h"
@@ -427,9 +426,6 @@ struct xe_device {*/ struct task_struct *pm_callback_task; -/** @pmu: performance monitoring unit */ -struct xe_pmu pmu; -/** @hwmon: hwmon subsystem integration */ struct xe_hwmon *hwmon;
drivers/gpu/drm/xe/xe_gt.c +0 -2
@@ -709,8 +709,6 @@ int xe_gt_suspend(struct xe_gt *gt)if (err) goto err_msg; -xe_pmu_suspend (gt); - err =xe_uc_suspend (>->uc);if (err) goto err_force_wake;
drivers/gpu/drm/xe/xe_module.c +0 -5
@@ -11,7 +11,6 @@#include "xe_drv.h" #include "xe_hw_fence.h" #include "xe_pci.h" -#include "xe_pmu.h" #include "xe_sched_job.h" struct xe_modparam xe_modparam = {
@@ -63,10 +62,6 @@ static const struct init_funcs init_funcs[] = { .init = xe_sched_job_module_init, .exit = xe_sched_job_module_exit, }, - { - .init = xe_pmu_init, - .exit = xe_pmu_exit, - }, { .init = xe_register_pci_driver, .exit = xe_unregister_pci_driver,
drivers/gpu/drm/xe/xe_pmu.c deleted +0 -645
645 lines not on this page · raw message
drivers/gpu/drm/xe/xe_pmu.h deleted +0 -25
@@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* -* Copyright © 2023 Intel Corporation -*/ - -#ifndef _XE_PMU_H_ -#define _XE_PMU_H_ - -#include "xe_gt_types.h" -#include "xe_pmu_types.h" - -#if IS_ENABLED (CONFIG_PERF_EVENTS ) -int xe_pmu_init (void ); -void xe_pmu_exit (void ); -void xe_pmu_register (struct xe_pmu *pmu); -void xe_pmu_suspend (struct xe_gt *gt); -#else -static inline int xe_pmu_init (void ) {return 0 ; } -static inline void xe_pmu_exit (void ) {} -static inline void xe_pmu_register (struct xe_pmu *pmu) {} -static inline void xe_pmu_suspend (struct xe_gt *gt) {} -#endif - -#endif -
drivers/gpu/drm/xe/xe_pmu_types.h deleted +0 -68
68 lines not on this page · raw message
include/uapi/drm/xe_drm.h +0 -40
@@ -1080,46 +1080,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
Signature · 1 line
2.41.0