[PATCH] drm/amdgpu: Only retrieve GPU address of GART table after pinning it

[Christian König]

Am 28.08.2018 um 11:27 schrieb Michel Dänzer:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Doing it earlier hits a WARN_ON_ONCE in amdgpu_bo_gpu_offset.
>
> Fixes: "drm/amdgpu: remove gart.table_addr"
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 5 ++++-
>   drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 ++++-
>   drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
>   3 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 543287e5d67b..9c45ea318bd6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -494,7 +494,7 @@ static void gmc_v6_0_set_prt(struct amdgpu_device *adev, bool enable)
>   
>   static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)
>   {
> -	uint64_t table_addr = amdgpu_bo_gpu_offset(adev->gart.bo);
> +	uint64_t table_addr;
>   	int r, i;
>   	u32 field;
>   
> @@ -505,6 +505,9 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)
>   	r = amdgpu_gart_table_vram_pin(adev);
>   	if (r)
>   		return r;
> +
> +	table_addr = amdgpu_bo_gpu_offset(adev->gart.bo);
> +
>   	/* Setup TLB control */
>   	WREG32(mmMC_VM_MX_L1_TLB_CNTL,
>   	       (0xA << 7) |
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index 060c79afef80..fc5fe187b614 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -604,7 +604,7 @@ static void gmc_v7_0_set_prt(struct amdgpu_device *adev, bool enable)
>    */
>   static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)
>   {
> -	uint64_t table_addr = amdgpu_bo_gpu_offset(adev->gart.bo);
> +	uint64_t table_addr;
>   	int r, i;
>   	u32 tmp, field;
>   
> @@ -615,6 +615,9 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)
>   	r = amdgpu_gart_table_vram_pin(adev);
>   	if (r)
>   		return r;
> +
> +	table_addr = amdgpu_bo_gpu_offset(adev->gart.bo);
> +
>   	/* Setup TLB control */
>   	tmp = RREG32(mmMC_VM_MX_L1_TLB_CNTL);
>   	tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ENABLE_L1_TLB, 1);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index 3fe9b9755cf7..91216cdf4d1c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -806,7 +806,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable)
>    */
>   static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)
>   {
> -	uint64_t table_addr = amdgpu_bo_gpu_offset(adev->gart.bo);
> +	uint64_t table_addr;
>   	int r, i;
>   	u32 tmp, field;
>   
> @@ -817,6 +817,9 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)
>   	r = amdgpu_gart_table_vram_pin(adev);
>   	if (r)
>   		return r;
> +
> +	table_addr = amdgpu_bo_gpu_offset(adev->gart.bo);
> +
>   	/* Setup TLB control */
>   	tmp = RREG32(mmMC_VM_MX_L1_TLB_CNTL);
>   	tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ENABLE_L1_TLB, 1);