[PATCH] drm/msm: Report primary minor index as gpu_mem_total gpu_id

[oushixiong1025]

From: Shixiong Ou <oushixiong@xxxxxxxxxx>

Both gpu_mem_total emissions hardcode gpu_id 0, so events from multiple
GPUs are indistinguishable. Report dev->primary->index instead, as xe
already does in commit ce3d39fae3d3 ("drm/xe/bo: add GPU memory trace
points").

Signed-off-by: Shixiong Ou <oushixiong@xxxxxxxxxx>
---
 drivers/gpu/drm/msm/msm_gem.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 130ae27ee00b..46dada0b2fa0 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -28,7 +28,7 @@ MODULE_IMPORT_NS("DMA_BUF");
 static void update_device_mem(struct msm_drm_private *priv, ssize_t size)
 {
 	uint64_t total_mem = atomic64_add_return(size, &priv->total_mem);
-	trace_gpu_mem_total(0, 0, total_mem);
+	trace_gpu_mem_total(priv->dev->primary->index, 0, total_mem);
 }
 
 static void update_ctx_mem(struct drm_file *file, ssize_t size)
@@ -37,7 +37,8 @@ static void update_ctx_mem(struct drm_file *file, ssize_t size)
 	uint64_t ctx_mem = atomic64_add_return(size, &ctx->ctx_mem);
 
 	rcu_read_lock(); /* Locks file->pid! */
-	trace_gpu_mem_total(0, pid_nr(rcu_dereference(file->pid)), ctx_mem);
+	trace_gpu_mem_total(file->minor->dev->primary->index,
+			    pid_nr(rcu_dereference(file->pid)), ctx_mem);
 	rcu_read_unlock();
 
 }
-- 
2.25.1


No virus found
		Checked by Hillstone Network AntiVirus