[PATCH 1/6] drm/amdgpu: Fix warnings in gfxhub_ v1_0, v1_2.c

Christian König christian.koenig at amd.com
Fri Jun 30 11:59:57 UTC 2023


Am 30.06.23 um 13:56 schrieb Srinivasan Shanmugam:
> Fix the below checkpatch warnings:
>
> WARNING: Block comments should align the * on each line
> +                       /*
> +                       * Raven2 has a HW issue that it is unable to use the
>
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> +       unsigned num_level, block_size;
>
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> +       unsigned i;
>
> WARNING: Missing a blank line after declarations
> +       u32 tmp;
> +       tmp = RREG32_SOC15(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL);
>
> WARNING: Block comments should align the * on each line
> +                               /*
> +                               * Raven2 has a HW issue that it is unable to use the
>
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> +       unsigned num_level, block_size;
>
> Cc: Christian König <christian.koenig at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam at amd.com>

Acked-by: Christian König <christian.koenig at amd.com> for the series.

> ---
>   drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 ++++---
>   drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 ++--
>   2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> index d94cc1ec7242..cdc290a474a9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> @@ -103,7 +103,7 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)
>   			min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18);
>   
>   		if (adev->apu_flags & AMD_APU_IS_RAVEN2)
> -			/*
> +		       /*
>   			* Raven2 has a HW issue that it is unable to use the
>   			* vram which is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR.
>   			* So here is the workaround that increase system
> @@ -248,7 +248,7 @@ static void gfxhub_v1_0_disable_identity_aperture(struct amdgpu_device *adev)
>   static void gfxhub_v1_0_setup_vmid_config(struct amdgpu_device *adev)
>   {
>   	struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB(0)];
> -	unsigned num_level, block_size;
> +	unsigned int num_level, block_size;
>   	uint32_t tmp;
>   	int i;
>   
> @@ -308,7 +308,7 @@ static void gfxhub_v1_0_setup_vmid_config(struct amdgpu_device *adev)
>   static void gfxhub_v1_0_program_invalidation(struct amdgpu_device *adev)
>   {
>   	struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB(0)];
> -	unsigned i;
> +	unsigned int i;
>   
>   	for (i = 0 ; i < 18; ++i) {
>   		WREG32_SOC15_OFFSET(GC, 0, mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32,
> @@ -375,6 +375,7 @@ static void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev,
>   						 bool value)
>   {
>   	u32 tmp;
> +
>   	tmp = RREG32_SOC15(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL);
>   	tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,
>   			RANGE_PROTECTION_FAULT_ENABLE_DEFAULT, value);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
> index 4dabf910334b..47f95ec218a3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
> @@ -140,7 +140,7 @@ gfxhub_v1_2_xcc_init_system_aperture_regs(struct amdgpu_device *adev,
>   				min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18);
>   
>   			if (adev->apu_flags & AMD_APU_IS_RAVEN2)
> -				/*
> +			       /*
>   				* Raven2 has a HW issue that it is unable to use the
>   				* vram which is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR.
>   				* So here is the workaround that increase system
> @@ -315,7 +315,7 @@ static void gfxhub_v1_2_xcc_setup_vmid_config(struct amdgpu_device *adev,
>   					      uint32_t xcc_mask)
>   {
>   	struct amdgpu_vmhub *hub;
> -	unsigned num_level, block_size;
> +	unsigned int num_level, block_size;
>   	uint32_t tmp;
>   	int i, j;
>   



More information about the amd-gfx mailing list