From b69e1f537fb3bb2a0d97e436ddcfb9c11d428f42 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 24 Mar 2023 11:05:30 +0100
Subject: Revert "gpu/trace: add a gpu total memory usage tracepoint"

This reverts commit bbd9d05618a6d608c72640b1d3d651a75913456a.

entirely unused.
---
 drivers/Kconfig                   |  2 --
 drivers/gpu/Makefile              |  1 -
 drivers/gpu/trace/Kconfig         |  4 ---
 drivers/gpu/trace/Makefile        |  3 ---
 drivers/gpu/trace/trace_gpu_mem.c | 13 ---------
 include/trace/events/gpu_mem.h    | 57 ---------------------------------------
 6 files changed, 80 deletions(-)
 delete mode 100644 drivers/gpu/trace/Kconfig
 delete mode 100644 drivers/gpu/trace/Makefile
 delete mode 100644 drivers/gpu/trace/trace_gpu_mem.c
 delete mode 100644 include/trace/events/gpu_mem.h

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 7bdad836fc62..b3d516f2d280 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -207,8 +207,6 @@ source "drivers/thunderbolt/Kconfig"
 
 source "drivers/android/Kconfig"
 
-source "drivers/gpu/trace/Kconfig"
-
 source "drivers/nvdimm/Kconfig"
 
 source "drivers/dax/Kconfig"
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 8997f0096545..3b0f40d94044 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -4,4 +4,3 @@
 # to ensure this currently.
 obj-y			+= host1x/ drm/ vga/
 obj-$(CONFIG_IMX_IPUV3_CORE)	+= ipu-v3/
-obj-$(CONFIG_TRACE_GPU_MEM)		+= trace/
diff --git a/drivers/gpu/trace/Kconfig b/drivers/gpu/trace/Kconfig
deleted file mode 100644
index c24e9edd022e..000000000000
--- a/drivers/gpu/trace/Kconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-config TRACE_GPU_MEM
-	bool
diff --git a/drivers/gpu/trace/Makefile b/drivers/gpu/trace/Makefile
deleted file mode 100644
index b70fbdc5847f..000000000000
--- a/drivers/gpu/trace/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
diff --git a/drivers/gpu/trace/trace_gpu_mem.c b/drivers/gpu/trace/trace_gpu_mem.c
deleted file mode 100644
index 01e855897b6d..000000000000
--- a/drivers/gpu/trace/trace_gpu_mem.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * GPU memory trace points
- *
- * Copyright (C) 2020 Google, Inc.
- */
-
-#include <linux/module.h>
-
-#define CREATE_TRACE_POINTS
-#include <trace/events/gpu_mem.h>
-
-EXPORT_TRACEPOINT_SYMBOL(gpu_mem_total);
diff --git a/include/trace/events/gpu_mem.h b/include/trace/events/gpu_mem.h
deleted file mode 100644
index 26d871f96e94..000000000000
--- a/include/trace/events/gpu_mem.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * GPU memory trace points
- *
- * Copyright (C) 2020 Google, Inc.
- */
-
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM gpu_mem
-
-#if !defined(_TRACE_GPU_MEM_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_GPU_MEM_H
-
-#include <linux/tracepoint.h>
-
-/*
- * The gpu_memory_total event indicates that there's an update to either the
- * global or process total gpu memory counters.
- *
- * This event should be emitted whenever the kernel device driver allocates,
- * frees, imports, unimports memory in the GPU addressable space.
- *
- * @gpu_id: This is the gpu id.
- *
- * @pid: Put 0 for global total, while positive pid for process total.
- *
- * @size: Size of the allocation in bytes.
- *
- */
-TRACE_EVENT(gpu_mem_total,
-
-	TP_PROTO(uint32_t gpu_id, uint32_t pid, uint64_t size),
-
-	TP_ARGS(gpu_id, pid, size),
-
-	TP_STRUCT__entry(
-		__field(uint32_t, gpu_id)
-		__field(uint32_t, pid)
-		__field(uint64_t, size)
-	),
-
-	TP_fast_assign(
-		__entry->gpu_id = gpu_id;
-		__entry->pid = pid;
-		__entry->size = size;
-	),
-
-	TP_printk("gpu_id=%u pid=%u size=%llu",
-		__entry->gpu_id,
-		__entry->pid,
-		__entry->size)
-);
-
-#endif /* _TRACE_GPU_MEM_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>
-- 
cgit v1.2.3