[PATCH] drm/amdgpu/gfx: create a common bitmask function

axie axie at amd.com
Tue Jun 6 21:55:41 UTC 2017


For such a simple function, I would implement it inside the header file 
with "static inline".

Thanks,

Alex Bin


On 2017-06-06 05:42 PM, Alex Deucher wrote:
> The same function was duplicated in all the gfx IPs. Use
> a single implementation for all.
>
> Suggested-by: Andres Rodriguez <andresx7 at gmail.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 13 +++++++++++++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h |  2 ++
>   drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c   | 11 +++--------
>   drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 19 +++----------------
>   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c   | 11 +++--------
>   drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c   | 11 +++--------
>   6 files changed, 27 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> index 1994335..29ab31b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> @@ -108,3 +108,16 @@ void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_s
>   		p = next + 1;
>   	}
>   }
> +
> +/**
> + * amdgpu_gfx_create_bitmask - create a bitmask
> + *
> + * @bit_width: length of the mask
> + *
> + * create a variable length bit mask.
> + * Returns the bitmask.
> + */
> +u32 amdgpu_gfx_create_bitmask(u32 bit_width)
> +{
> +	return (u32)((1ULL << bit_width) - 1);
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
> index e0204408..7fcfbe2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
> @@ -30,4 +30,6 @@ void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg);
>   void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se,
>   		unsigned max_sh);
>   
> +u32 amdgpu_gfx_create_bitmask(u32 bit_width);
> +
>   #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> index f3e0edd..cfd3df6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> @@ -1116,11 +1116,6 @@ static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, u32 se_num,
>   	WREG32(mmGRBM_GFX_INDEX, data);
>   }
>   
> -static u32 gfx_v6_0_create_bitmask(u32 bit_width)
> -{
> -	return (u32)(((u64)1 << bit_width) - 1);
> -}
> -
>   static u32 gfx_v6_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>   {
>   	u32 data, mask;
> @@ -1130,8 +1125,8 @@ static u32 gfx_v6_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>   
>   	data = REG_GET_FIELD(data, GC_USER_RB_BACKEND_DISABLE, BACKEND_DISABLE);
>   
> -	mask = gfx_v6_0_create_bitmask(adev->gfx.config.max_backends_per_se/
> -					adev->gfx.config.max_sh_per_se);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_backends_per_se/
> +					 adev->gfx.config.max_sh_per_se);
>   
>   	return ~data & mask;
>   }
> @@ -1333,7 +1328,7 @@ static u32 gfx_v6_0_get_cu_enabled(struct amdgpu_device *adev)
>   	data = RREG32(mmCC_GC_SHADER_ARRAY_CONFIG) |
>   		RREG32(mmGC_USER_SHADER_ARRAY_CONFIG);
>   
> -	mask = gfx_v6_0_create_bitmask(adev->gfx.config.max_cu_per_sh);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_cu_per_sh);
>   	return ~REG_GET_FIELD(data, CC_GC_SHADER_ARRAY_CONFIG, INACTIVE_CUS) & mask;
>   }
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> index ae98611..4c04e9d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> @@ -1608,19 +1608,6 @@ static void gfx_v7_0_select_se_sh(struct amdgpu_device *adev,
>   }
>   
>   /**
> - * gfx_v7_0_create_bitmask - create a bitmask
> - *
> - * @bit_width: length of the mask
> - *
> - * create a variable length bit mask (CIK).
> - * Returns the bitmask.
> - */
> -static u32 gfx_v7_0_create_bitmask(u32 bit_width)
> -{
> -	return (u32)((1ULL << bit_width) - 1);
> -}
> -
> -/**
>    * gfx_v7_0_get_rb_active_bitmap - computes the mask of enabled RBs
>    *
>    * @adev: amdgpu_device pointer
> @@ -1638,8 +1625,8 @@ static u32 gfx_v7_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>   	data &= CC_RB_BACKEND_DISABLE__BACKEND_DISABLE_MASK;
>   	data >>= GC_USER_RB_BACKEND_DISABLE__BACKEND_DISABLE__SHIFT;
>   
> -	mask = gfx_v7_0_create_bitmask(adev->gfx.config.max_backends_per_se /
> -				       adev->gfx.config.max_sh_per_se);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_backends_per_se /
> +					 adev->gfx.config.max_sh_per_se);
>   
>   	return (~data) & mask;
>   }
> @@ -4157,7 +4144,7 @@ static u32 gfx_v7_0_get_cu_active_bitmap(struct amdgpu_device *adev)
>   	data &= CC_GC_SHADER_ARRAY_CONFIG__INACTIVE_CUS_MASK;
>   	data >>= CC_GC_SHADER_ARRAY_CONFIG__INACTIVE_CUS__SHIFT;
>   
> -	mask = gfx_v7_0_create_bitmask(adev->gfx.config.max_cu_per_sh);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_cu_per_sh);
>   
>   	return (~data) & mask;
>   }
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index afd7d65..ad2e0bb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -3635,11 +3635,6 @@ static void gfx_v8_0_select_se_sh(struct amdgpu_device *adev,
>   	WREG32(mmGRBM_GFX_INDEX, data);
>   }
>   
> -static u32 gfx_v8_0_create_bitmask(u32 bit_width)
> -{
> -	return (u32)((1ULL << bit_width) - 1);
> -}
> -
>   static u32 gfx_v8_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>   {
>   	u32 data, mask;
> @@ -3649,8 +3644,8 @@ static u32 gfx_v8_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>   
>   	data = REG_GET_FIELD(data, GC_USER_RB_BACKEND_DISABLE, BACKEND_DISABLE);
>   
> -	mask = gfx_v8_0_create_bitmask(adev->gfx.config.max_backends_per_se /
> -				       adev->gfx.config.max_sh_per_se);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_backends_per_se /
> +					 adev->gfx.config.max_sh_per_se);
>   
>   	return (~data) & mask;
>   }
> @@ -7150,7 +7145,7 @@ static u32 gfx_v8_0_get_cu_active_bitmap(struct amdgpu_device *adev)
>   	data =  RREG32(mmCC_GC_SHADER_ARRAY_CONFIG) |
>   		RREG32(mmGC_USER_SHADER_ARRAY_CONFIG);
>   
> -	mask = gfx_v8_0_create_bitmask(adev->gfx.config.max_cu_per_sh);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_cu_per_sh);
>   
>   	return ~REG_GET_FIELD(data, CC_GC_SHADER_ARRAY_CONFIG, INACTIVE_CUS) & mask;
>   }
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 276dc06..cf15a350 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1698,11 +1698,6 @@ static void gfx_v9_0_select_se_sh(struct amdgpu_device *adev, u32 se_num, u32 sh
>   	WREG32_SOC15(GC, 0, mmGRBM_GFX_INDEX, data);
>   }
>   
> -static u32 gfx_v9_0_create_bitmask(u32 bit_width)
> -{
> -	return (u32)((1ULL << bit_width) - 1);
> -}
> -
>   static u32 gfx_v9_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>   {
>   	u32 data, mask;
> @@ -1713,8 +1708,8 @@ static u32 gfx_v9_0_get_rb_active_bitmap(struct amdgpu_device *adev)
>   	data &= CC_RB_BACKEND_DISABLE__BACKEND_DISABLE_MASK;
>   	data >>= GC_USER_RB_BACKEND_DISABLE__BACKEND_DISABLE__SHIFT;
>   
> -	mask = gfx_v9_0_create_bitmask(adev->gfx.config.max_backends_per_se /
> -				       adev->gfx.config.max_sh_per_se);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_backends_per_se /
> +					 adev->gfx.config.max_sh_per_se);
>   
>   	return (~data) & mask;
>   }
> @@ -4609,7 +4604,7 @@ static u32 gfx_v9_0_get_cu_active_bitmap(struct amdgpu_device *adev)
>   	data &= CC_GC_SHADER_ARRAY_CONFIG__INACTIVE_CUS_MASK;
>   	data >>= CC_GC_SHADER_ARRAY_CONFIG__INACTIVE_CUS__SHIFT;
>   
> -	mask = gfx_v9_0_create_bitmask(adev->gfx.config.max_cu_per_sh);
> +	mask = amdgpu_gfx_create_bitmask(adev->gfx.config.max_cu_per_sh);
>   
>   	return (~data) & mask;
>   }



More information about the amd-gfx mailing list