[AMD Official Use Only] Reviewed-by: Peng Ju Zhou <pengju.z...@amd.com>
> -----Original Message-----
> From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of Sun,
> Roy
> Sent: Thursday, July 8, 2021 6:25 PM
> To: Sun, Roy <roy....@amd.com>; amd-gfx@lists.freedesktop.org
> Subject: RE: [PATCH] drm/amdgpu: change the imprecise function name
>
> [AMD Official Use Only]
>
> Ping
>
> -----Original Message-----
> From: Roy Sun <roy....@amd.com>
> Sent: Wednesday, July 7, 2021 4:11 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Sun, Roy <roy....@amd.com>
> Subject: [PATCH] drm/amdgpu: change the imprecise function name
>
> The callback functions are used for SRIOV read/write instead of just for rlcg
> read/write
>
> Signed-off-by: Roy Sun <roy....@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 ++--
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 ++++----
> 5 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index eb1f3f42e00b..aa94ad0e9973 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -508,7 +508,7 @@ void amdgpu_mm_wreg_mmio_rlc(struct
> amdgpu_device *adev,
> adev->gfx.rlc.funcs &&
> adev->gfx.rlc.funcs->is_rlcg_access_range) {
> if (adev->gfx.rlc.funcs->is_rlcg_access_range(adev, reg))
> - return adev->gfx.rlc.funcs->rlcg_wreg(adev, reg, v, 0,
> 0);
> + return adev->gfx.rlc.funcs->sriov_wreg(adev, reg, v, 0,
> 0);
> } else {
> writel(v, ((void __iomem *)adev->rmmio) + (reg * 4));
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> index 7a4775ab6804..00afd0dcae86 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
> @@ -127,8 +127,8 @@ struct amdgpu_rlc_funcs {
> void (*reset)(struct amdgpu_device *adev);
> void (*start)(struct amdgpu_device *adev);
> void (*update_spm_vmid)(struct amdgpu_device *adev, unsigned
> vmid);
> - void (*rlcg_wreg)(struct amdgpu_device *adev, u32 offset, u32 v, u32
> acc_flags, u32 hwip);
> - u32 (*rlcg_rreg)(struct amdgpu_device *adev, u32 offset, u32 acc_flags,
> u32 hwip);
> + void (*sriov_wreg)(struct amdgpu_device *adev, u32 offset, u32 v, u32
> acc_flags, u32 hwip);
> + u32 (*sriov_rreg)(struct amdgpu_device *adev, u32 offset, u32
> +acc_flags, u32 hwip);
> bool (*is_rlcg_access_range)(struct amdgpu_device *adev, uint32_t
> reg); };
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 705fa3027199..bc4347a72301 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -1542,7 +1542,7 @@ static u32 gfx_v10_rlcg_rw(struct amdgpu_device
> *adev, u32 offset, u32 v, uint32
> return ret;
> }
>
> -static void gfx_v10_rlcg_wreg(struct amdgpu_device *adev, u32 offset, u32
> value, u32 acc_flags, u32 hwip)
> +static void gfx_v10_sriov_wreg(struct amdgpu_device *adev, u32 offset,
> +u32 value, u32 acc_flags, u32 hwip)
> {
> u32 rlcg_flag;
>
> @@ -1558,7 +1558,7 @@ static void gfx_v10_rlcg_wreg(struct amdgpu_device
> *adev, u32 offset, u32 value,
> WREG32(offset, value);
> }
>
> -static u32 gfx_v10_rlcg_rreg(struct amdgpu_device *adev, u32 offset, u32
> acc_flags, u32 hwip)
> +static u32 gfx_v10_sriov_rreg(struct amdgpu_device *adev, u32 offset,
> +u32 acc_flags, u32 hwip)
> {
> u32 rlcg_flag;
>
> @@ -8269,8 +8269,8 @@ static const struct amdgpu_rlc_funcs
> gfx_v10_0_rlc_funcs_sriov = {
> .reset = gfx_v10_0_rlc_reset,
> .start = gfx_v10_0_rlc_start,
> .update_spm_vmid = gfx_v10_0_update_spm_vmid,
> - .rlcg_wreg = gfx_v10_rlcg_wreg,
> - .rlcg_rreg = gfx_v10_rlcg_rreg,
> + .sriov_wreg = gfx_v10_sriov_wreg,
> + .sriov_rreg = gfx_v10_sriov_rreg,
> .is_rlcg_access_range = gfx_v10_0_is_rlcg_access_range, };
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 044076ec1d03..03acc777adf7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -787,7 +787,7 @@ static void gfx_v9_0_rlcg_w(struct amdgpu_device
> *adev, u32 offset, u32 v, u32 f
>
> }
>
> -static void gfx_v9_0_rlcg_wreg(struct amdgpu_device *adev, u32 offset,
> +static void gfx_v9_0_sriov_wreg(struct amdgpu_device *adev, u32 offset,
> u32 v, u32 acc_flags, u32 hwip) {
> if ((acc_flags & AMDGPU_REGS_RLC) &&
> @@ -5131,7 +5131,7 @@ static const struct amdgpu_rlc_funcs
> gfx_v9_0_rlc_funcs = {
> .reset = gfx_v9_0_rlc_reset,
> .start = gfx_v9_0_rlc_start,
> .update_spm_vmid = gfx_v9_0_update_spm_vmid,
> - .rlcg_wreg = gfx_v9_0_rlcg_wreg,
> + .sriov_wreg = gfx_v9_0_sriov_wreg,
> .is_rlcg_access_range = gfx_v9_0_is_rlcg_access_range, };
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> b/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> index 0eeb5e073be8..8a9ca87d8663 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15_common.h
> @@ -28,13 +28,13 @@
> #define SOC15_REG_OFFSET(ip, inst, reg) (adev-
> >reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)
>
> #define __WREG32_SOC15_RLC__(reg, value, flag, hwip) \
> - ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev-
> >gfx.rlc.funcs->rlcg_wreg) ? \
> - adev->gfx.rlc.funcs->rlcg_wreg(adev, reg, value, flag, hwip) : \
> + ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev-
> >gfx.rlc.funcs->sriov_wreg) ? \
> + adev->gfx.rlc.funcs->sriov_wreg(adev, reg, value, flag, hwip) : \
> WREG32(reg, value))
>
> #define __RREG32_SOC15_RLC__(reg, flag, hwip) \
> - ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev-
> >gfx.rlc.funcs->rlcg_rreg) ? \
> - adev->gfx.rlc.funcs->rlcg_rreg(adev, reg, flag, hwip) : \
> + ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev-
> >gfx.rlc.funcs->sriov_rreg) ? \
> + adev->gfx.rlc.funcs->sriov_rreg(adev, reg, flag, hwip) : \
> RREG32(reg))
>
> #define WREG32_FIELD15(ip, idx, reg, field, val) \
> --
> 2.32.0
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fr
> eedesktop.org%2Fmailman%2Flistinfo%2Famd-
> gfx&data=04%7C01%7CPengju.Zhou%40amd.com%7Cfb5afa2cf14b4e589
> 36908d941faa406%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C63
> 7613367028481482%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAi
> LCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=p2D
> P34yseHFHIZfRg91LavBQAyBoN86dq4OnCT7l%2BaM%3D&reserved=0
<<attachment: winmail.dat>>
_______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
