From 7cd88efd16f46023d2359430bb49781e879229c7 Mon Sep 17 00:00:00 2001 From: Hawking Zhang Date: Fri, 6 Jun 2025 00:26:07 +0800 Subject: [PATCH] drm/amdgpu: Move XCP_INST_MASK amdgpu_xcp.h Move the common macro for xcp manger to amdgpu_xcp.h Signed-off-by: Hawking Zhang Reviewed-by: Likun Gao Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 3 +++ drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h index 1928d9e224fca..8058e8f35d414 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h @@ -41,6 +41,9 @@ #define AMDGPU_XCP_OPS_KFD (1 << 0) +#define XCP_INST_MASK(num_inst, xcp_id) \ + (num_inst ? GENMASK(num_inst - 1, 0) << (xcp_id * num_inst) : 0) + struct amdgpu_fpriv; enum AMDGPU_XCP_IP_BLOCK { diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c index f9e2edf5260bc..d9842aa25283a 100644 --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c @@ -31,9 +31,6 @@ #include "sdma_v4_4_2.h" #include "amdgpu_ip.h" -#define XCP_INST_MASK(num_inst, xcp_id) \ - (num_inst ? GENMASK(num_inst - 1, 0) << (xcp_id * num_inst) : 0) - void aqua_vanjaram_doorbell_index_init(struct amdgpu_device *adev) { int i; -- 2.47.3