[AMD Official Use Only - AMD Internal Distribution Only]
The series is:
Reviewed-by: Tao Zhou <tao.zhou1@xxxxxxx>
> -----Original Message-----
> From: Wang, Yang(Kevin) <KevinYang.Wang@xxxxxxx>
> Sent: Monday, December 2, 2024 4:49 PM
> To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Zhang, Hawking <Hawking.Zhang@xxxxxxx>; Zhou1, Tao
> <Tao.Zhou1@xxxxxxx>; Yang, Stanley <Stanley.Yang@xxxxxxx>; Zhang,
> Hawking <Hawking.Zhang@xxxxxxx>
> Subject: [PATCH 1/3] drm/amdgpu: move common ACA ipid defines into
> amdgpu_aca.h
>
> move common ACA ipid defines into amdgpu_aca.h file.
>
> Signed-off-by: Yang Wang <kevinyang.wang@xxxxxxx>
> Reviewed-by: Hawking Zhang <Hawking.Zhang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 5 +++++
> drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 4 ----
> drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 1 -
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
> index 5ef6b745f222..f3289d289913 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
> @@ -71,6 +71,11 @@ struct ras_query_context;
> #define ACA_ERROR_CE_MASK BIT_MASK(ACA_ERROR_TYPE_CE)
> #define ACA_ERROR_DEFERRED_MASK
> BIT_MASK(ACA_ERROR_TYPE_DEFERRED)
>
> +#define mmSMNAID_AID0_MCA_SMU 0x03b30400 /* SMN AID AID0
> */
> +#define mmSMNAID_XCD0_MCA_SMU 0x36430400 /* SMN AID
> XCD0 */
> +#define mmSMNAID_XCD1_MCA_SMU 0x38430400 /* SMN AID
> XCD1 */
> +#define mmSMNXCD_XCD0_MCA_SMU 0x40430400 /* SMN XCD
> XCD0 */
> +
> enum aca_reg_idx {
> ACA_REG_IDX_CTL = 0,
> ACA_REG_IDX_STATUS = 1,
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> index f23df55d72fd..4e920607a278 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> @@ -52,10 +52,6 @@ MODULE_FIRMWARE("amdgpu/gc_9_4_4_rlc.bin");
> #define GOLDEN_GB_ADDR_CONFIG 0x2a114042 #define
> CP_HQD_PERSISTENT_STATE_DEFAULT 0xbe05301
>
> -#define mmSMNAID_XCD0_MCA_SMU 0x36430400 /* SMN AID XCD0 */
> -#define mmSMNAID_XCD1_MCA_SMU 0x38430400 /* SMN AID XCD1 */
> -#define mmSMNXCD_XCD0_MCA_SMU 0x40430400 /* SMN XCD XCD0 */
> -
> #define XCC_REG_RANGE_0_LOW 0x2000 /* XCC gfxdec0 lower Bound */
> #define XCC_REG_RANGE_0_HIGH 0x3400 /* XCC gfxdec0 upper Bound */
> #define XCC_REG_RANGE_1_LOW 0xA000 /* XCC gfxdec1 lower Bound */
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
> b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
> index b01bb759d0f4..e646e5cef0a2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
> @@ -33,7 +33,6 @@
>
> #define regVM_L2_CNTL3_DEFAULT 0x80100007
> #define regVM_L2_CNTL4_DEFAULT 0x000000c1
> -#define mmSMNAID_AID0_MCA_SMU 0x03b30400
>
> static u64 mmhub_v1_8_get_fb_location(struct amdgpu_device *adev) {
> --
> 2.34.1
