[PATCH 09/11] drm/amdgpu: drop error return from flush_gpu_tlb_pasid
Alex Deucher
alexdeucher at gmail.com
Tue Sep 5 22:48:06 UTC 2023
On Tue, Sep 5, 2023 at 2:30 AM Christian König
<ckoenig.leichtzumerken at gmail.com> wrote:
>
> That function never fails, drop the error return.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 7 ++++---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +++---
> drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 7 +++----
> drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 7 +++----
> drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 ++++-----
> drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 ++++-----
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 +++-----
> 7 files changed, 24 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> index b5f1a1218725..15814cb801e7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> @@ -638,9 +638,10 @@ int amdgpu_gmc_flush_gpu_tlb_pasid(struct amdgpu_device *adev, uint16_t pasid,
>
> if (!adev->gmc.flush_pasid_uses_kiq || !ring->sched.ready ||
> !down_read_trylock(&adev->reset_domain->sem)) {
> - return adev->gmc.gmc_funcs->flush_gpu_tlb_pasid(adev, pasid,
> - flush_type,
> - all_hub, inst);
> + adev->gmc.gmc_funcs->flush_gpu_tlb_pasid(adev, pasid,
> + flush_type, all_hub,
> + inst);
> + return 0;
> }
>
> /* 2 dwords flush + 8 dwords fence */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> index 7732d4ef845e..dd0ede75e5d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> @@ -130,9 +130,9 @@ struct amdgpu_gmc_funcs {
> void (*flush_gpu_tlb)(struct amdgpu_device *adev, uint32_t vmid,
> uint32_t vmhub, uint32_t flush_type);
> /* flush the vm tlb via pasid */
> - int (*flush_gpu_tlb_pasid)(struct amdgpu_device *adev, uint16_t pasid,
> - uint32_t flush_type, bool all_hub,
> - uint32_t inst);
> + void (*flush_gpu_tlb_pasid)(struct amdgpu_device *adev, uint16_t pasid,
> + uint32_t flush_type, bool all_hub,
> + uint32_t inst);
> /* flush the vm tlb via ring */
> uint64_t (*emit_flush_gpu_tlb)(struct amdgpu_ring *ring, unsigned vmid,
> uint64_t pd_addr);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index 407ddb926941..40d432d46469 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -337,9 +337,9 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
> *
> * Flush the TLB for the requested pasid.
> */
> -static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> - uint16_t pasid, uint32_t flush_type,
> - bool all_hub, uint32_t inst)
> +static void gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> + uint16_t pasid, uint32_t flush_type,
> + bool all_hub, uint32_t inst)
> {
> uint16_t queried;
> int vmid, i;
> @@ -362,7 +362,6 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> flush_type);
> }
> }
> - return 0;
> }
>
> static uint64_t gmc_v10_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> index aa39c1087e44..50bc5f151038 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
> @@ -299,9 +299,9 @@ static void gmc_v11_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
> *
> * Flush the TLB for the requested pasid.
> */
> -static int gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> - uint16_t pasid, uint32_t flush_type,
> - bool all_hub, uint32_t inst)
> +static void gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> + uint16_t pasid, uint32_t flush_type,
> + bool all_hub, uint32_t inst)
> {
> uint16_t queried;
> int vmid, i;
> @@ -324,7 +324,6 @@ static int gmc_v11_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> flush_type);
> }
> }
> - return 0;
> }
>
> static uint64_t gmc_v11_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index 9e19a752f94b..fa3586efacd2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -423,15 +423,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev)
> *
> * Flush the TLB for the requested pasid.
> */
> -static int gmc_v7_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> - uint16_t pasid, uint32_t flush_type,
> - bool all_hub, uint32_t inst)
> +static void gmc_v7_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> + uint16_t pasid, uint32_t flush_type,
> + bool all_hub, uint32_t inst)
> {
> u32 mask = 0x0;
> int vmid;
>
> if(!down_read_trylock(&adev->reset_domain->sem))
> - return 0;
> + return;
>
> for (vmid = 1; vmid < 16; vmid++) {
> u32 tmp = RREG32(mmATC_VMID0_PASID_MAPPING + vmid);
> @@ -444,7 +444,6 @@ static int gmc_v7_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> WREG32(mmVM_INVALIDATE_REQUEST, mask);
> RREG32(mmVM_INVALIDATE_RESPONSE);
> up_read(&adev->reset_domain->sem);
> - return 0;
> }
>
> /*
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index 2d51531a1f2d..ffcd79d28b9a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -613,15 +613,15 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
> *
> * Flush the TLB for the requested pasid.
> */
> -static int gmc_v8_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> - uint16_t pasid, uint32_t flush_type,
> - bool all_hub, uint32_t inst)
> +static void gmc_v8_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> + uint16_t pasid, uint32_t flush_type,
> + bool all_hub, uint32_t inst)
> {
> u32 mask = 0x0;
> int vmid;
>
> if(!down_read_trylock(&adev->reset_domain->sem))
> - return 0;
> + return;
>
> for (vmid = 1; vmid < 16; vmid++) {
> u32 tmp = RREG32(mmATC_VMID0_PASID_MAPPING + vmid);
> @@ -634,7 +634,6 @@ static int gmc_v8_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> WREG32(mmVM_INVALIDATE_REQUEST, mask);
> RREG32(mmVM_INVALIDATE_RESPONSE);
> up_read(&adev->reset_domain->sem);
> - return 0;
> }
>
> /*
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 39016b6900d3..94ba16536fc2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -950,9 +950,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
> *
> * Flush the TLB for the requested pasid.
> */
> -static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> - uint16_t pasid, uint32_t flush_type,
> - bool all_hub, uint32_t inst)
> +static void gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> + uint16_t pasid, uint32_t flush_type,
> + bool all_hub, uint32_t inst)
> {
> uint16_t queried;
> int i, vmid;
> @@ -976,8 +976,6 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> flush_type);
> }
> }
> -
> - return 0;
> }
>
> static uint64_t gmc_v9_0_emit_flush_gpu_tlb(struct amdgpu_ring *ring,
> --
> 2.34.1
>
More information about the amd-gfx
mailing list