From: Hawking Zhang Date: Thu, 5 Jun 2025 16:26:07 +0000 (+0800) Subject: drm/amdgpu: Move XCP_INST_MASK amdgpu_xcp.h X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd88efd16f46023d2359430bb49781e879229c7;p=thirdparty%2Fkernel%2Flinux.git 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 --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h index 1928d9e224fc..8058e8f35d41 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 f9e2edf5260b..d9842aa25283 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;