Attachment 106432 Details for Bug 83996 – Test for reverting the patch in question.

[patch] Test for reverting the patch in question.

0001-Revert-drm-radeon-Remove-radeon_gart_restore.patch (text/plain), 7.80 KB, created by Christian König on 2014-09-17 14:20:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2014-09-17 14:20:26 UTC

Size: 7.80 KB

patch

obsolete

>From 6717c70e1d3f4a5804c756ca4c4c8ff35e06eb3c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Wed, 17 Sep 2014 16:00:35 +0200
>Subject: [PATCH] Revert "drm/radeon: Remove radeon_gart_restore()"
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This reverts commit a3eb06dbca08e3fdad7039021ae03b46b215f22a.
>
>Also add a couple of more warnings.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/radeon/cik.c         |  1 +
> drivers/gpu/drm/radeon/evergreen.c   |  1 +
> drivers/gpu/drm/radeon/ni.c          |  1 +
> drivers/gpu/drm/radeon/r100.c        |  1 +
> drivers/gpu/drm/radeon/r300.c        |  1 +
> drivers/gpu/drm/radeon/r600.c        |  1 +
> drivers/gpu/drm/radeon/radeon.h      |  1 +
> drivers/gpu/drm/radeon/radeon_gart.c | 33 +++++++++++++++++++++++++++++++--
> drivers/gpu/drm/radeon/rs400.c       |  1 +
> drivers/gpu/drm/radeon/rs600.c       |  1 +
> drivers/gpu/drm/radeon/rv770.c       |  1 +
> drivers/gpu/drm/radeon/si.c          |  1 +
> 12 files changed, 42 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
>index f4e1470..be12664 100644
>--- a/drivers/gpu/drm/radeon/cik.c
>+++ b/drivers/gpu/drm/radeon/cik.c
>@@ -5715,6 +5715,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 	/* Setup TLB control */
> 	WREG32(MC_VM_MX_L1_TLB_CNTL,
> 	       (0xA << 7) |
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index dbca60c..910d5df 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -2424,6 +2424,7 @@ static int evergreen_pcie_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 	/* Setup L2 cache */
> 	WREG32(VM_L2_CNTL, ENABLE_L2_CACHE | ENABLE_L2_FRAGMENT_PROCESSING |
> 				ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE |
>diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
>index ba89375..e1bbe77 100644
>--- a/drivers/gpu/drm/radeon/ni.c
>+++ b/drivers/gpu/drm/radeon/ni.c
>@@ -1229,6 +1229,7 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 	/* Setup TLB control */
> 	WREG32(MC_VM_MX_L1_TLB_CNTL,
> 	       (0xA << 7) |
>diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
>index 4c5ec44..14228a7 100644
>--- a/drivers/gpu/drm/radeon/r100.c
>+++ b/drivers/gpu/drm/radeon/r100.c
>@@ -652,6 +652,7 @@ int r100_pci_gart_enable(struct radeon_device *rdev)
> {
> 	uint32_t tmp;
> 
>+	radeon_gart_restore(rdev);
> 	/* discard memory request outside of configured range */
> 	tmp = RREG32(RADEON_AIC_CNTL) | RADEON_DIS_OUT_OF_PCI_GART_ACCESS;
> 	WREG32(RADEON_AIC_CNTL, tmp);
>diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
>index 1bc4704..9174b84 100644
>--- a/drivers/gpu/drm/radeon/r300.c
>+++ b/drivers/gpu/drm/radeon/r300.c
>@@ -126,6 +126,7 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 	/* discard memory request outside of configured range */
> 	tmp = RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;
> 	WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index e8bf0ea..76d7790 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -968,6 +968,7 @@ static int r600_pcie_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 
> 	/* Setup L2 cache */
> 	WREG32(VM_L2_CNTL, ENABLE_L2_CACHE | ENABLE_L2_FRAGMENT_PROCESSING |
>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>index b281886..158951c 100644
>--- a/drivers/gpu/drm/radeon/radeon.h
>+++ b/drivers/gpu/drm/radeon/radeon.h
>@@ -629,6 +629,7 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
> int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
> 		     int pages, struct page **pagelist,
> 		     dma_addr_t *dma_addr, uint32_t flags);
>+void radeon_gart_restore(struct radeon_device *rdev);
> 
> 
> /*
>diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
>index a053a07..bb8aeb9 100644
>--- a/drivers/gpu/drm/radeon/radeon_gart.c
>+++ b/drivers/gpu/drm/radeon/radeon_gart.c
>@@ -230,7 +230,7 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
> 	int i, j;
> 	u64 page_base;
> 
>-	if (!rdev->gart.ready) {
>+	if (!rdev->gart.ready || !rdev->gart.ptr) {
> 		WARN(1, "trying to unbind memory from uninitialized GART !\n");
> 		return;
> 	}
>@@ -277,7 +277,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
> 	uint64_t page_base;
> 	int i, j;
> 
>-	if (!rdev->gart.ready) {
>+	if (!rdev->gart.ready || !rdev->gart.ptr) {
> 		WARN(1, "trying to bind memory to uninitialized GART !\n");
> 		return -EINVAL;
> 	}
>@@ -301,6 +301,35 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
> }
> 
> /**
>+ * radeon_gart_restore - bind all pages in the gart page table
>+ *
>+ * @rdev: radeon_device pointer
>+ *
>+ * Binds all pages in the gart page table (all asics).
>+ * Used to rebuild the gart table on device startup or resume.
>+ */
>+void radeon_gart_restore(struct radeon_device *rdev)
>+{
>+	uint32_t flags = RADEON_GART_PAGE_VALID | RADEON_GART_PAGE_READ |
>+		RADEON_GART_PAGE_WRITE | RADEON_GART_PAGE_SNOOP;
>+	int i, j, t;
>+	u64 page_base;
>+
>+	if (!rdev->gart.ptr) {
>+		return;
>+	}
>+	for (i = 0, t = 0; i < rdev->gart.num_cpu_pages; i++) {
>+		page_base = rdev->gart.pages_addr[i];
>+		for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {
>+			radeon_gart_set_page(rdev, t, page_base, flags);
>+			page_base += RADEON_GPU_PAGE_SIZE;
>+		}
>+	}
>+	mb();
>+	radeon_gart_tlb_flush(rdev);
>+}
>+
>+/**
>  * radeon_gart_init - init the driver info for managing the gart
>  *
>  * @rdev: radeon_device pointer
>diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
>index 6c1fc33..06492dc 100644
>--- a/drivers/gpu/drm/radeon/rs400.c
>+++ b/drivers/gpu/drm/radeon/rs400.c
>@@ -109,6 +109,7 @@ int rs400_gart_enable(struct radeon_device *rdev)
> 	uint32_t size_reg;
> 	uint32_t tmp;
> 
>+	radeon_gart_restore(rdev);
> 	tmp = RREG32_MC(RS690_AIC_CTRL_SCRATCH);
> 	tmp |= RS690_DIS_OUT_OF_PCI_GART_ACCESS;
> 	WREG32_MC(RS690_AIC_CTRL_SCRATCH, tmp);
>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
>index 5f6db46..26faadb 100644
>--- a/drivers/gpu/drm/radeon/rs600.c
>+++ b/drivers/gpu/drm/radeon/rs600.c
>@@ -555,6 +555,7 @@ static int rs600_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 	/* Enable bus master */
> 	tmp = RREG32(RADEON_BUS_CNTL) & ~RS600_BUS_MASTER_DIS;
> 	WREG32(RADEON_BUS_CNTL, tmp);
>diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
>index 2983f17..da8703d 100644
>--- a/drivers/gpu/drm/radeon/rv770.c
>+++ b/drivers/gpu/drm/radeon/rv770.c
>@@ -900,6 +900,7 @@ static int rv770_pcie_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 	/* Setup L2 cache */
> 	WREG32(VM_L2_CNTL, ENABLE_L2_CACHE | ENABLE_L2_FRAGMENT_PROCESSING |
> 				ENABLE_L2_PTE_CACHE_LRU_UPDATE_BY_WRITE |
>diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
>index a1274a3..ad09815 100644
>--- a/drivers/gpu/drm/radeon/si.c
>+++ b/drivers/gpu/drm/radeon/si.c
>@@ -4246,6 +4246,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
> 	r = radeon_gart_table_vram_pin(rdev);
> 	if (r)
> 		return r;
>+	radeon_gart_restore(rdev);
> 	/* Setup TLB control */
> 	WREG32(MC_VM_MX_L1_TLB_CNTL,
> 	       (0xA << 7) |
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 83996: 106432 | 106469 | 106470

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.