Attachment 141310 Details for Bug 107689 – 0001-drm-amdgpu-Only-retrieve-GPU-address-of-GART-table-a.patch

[patch] 0001-drm-amdgpu-Only-retrieve-GPU-address-of-GART-table-a.patch

0001-drm-amdgpu-Only-retrieve-GPU-address-of-GART-table-a.patch (text/plain), 3.09 KB, created by Andrey Grodzovsky on 2018-08-28 15:50:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Grodzovsky

Created: 2018-08-28 15:50:08 UTC

Size: 3.09 KB

patch

obsolete

>From 535584c50b86a3a36436539d49f8ab9b5d209a5f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Tue, 28 Aug 2018 11:26:17 +0200
>Subject: drm/amdgpu: Only retrieve GPU address of GART table after pinning it
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Doing it earlier hits a WARN_ON_ONCE in amdgpu_bo_gpu_offset.
>
>Fixes: "drm/amdgpu: remove gart.table_addr"
>
>Reviewed-by: Christian KÃ¶nig <christian.koenig@amd.com>
>Signed-off-by: Michel DÃ¤nzer <michel.daenzer@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 543287e..9c45ea3 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 060c79a..fc5fe18 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 3fe9b97..91216cd 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);
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 107689: 141300 | 141310 | 141365

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.