Commit 90a8b23f authored by Ashutosh Dixit's avatar Ashutosh Dixit Committed by Rodrigo Vivi
Browse files

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.

v2: Include xe_drm.h in xe/tests/xe_dma_buf.c (Francois)

Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Acked-by: default avatarAravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
Acked-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Acked-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Acked-by: default avatarMateusz Naklicki <mateusz.naklicki@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 9d329b4c

drivers/gpu/drm/xe/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,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
Original line number Diff line number Diff line
@@ -316,11 +316,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/tests/xe_dma_buf.c

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Copyright © 2022 Intel Corporation

 */



#include <drm/xe_drm.h>



#include <kunit/test.h>

#include <kunit/visibility.h>

drivers/gpu/drm/xe/xe_device.c

+0 −2
Original line number Diff line number Diff line
@@ -529,8 +529,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
Original line number Diff line number Diff line
@@ -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;