Attachment 112529 Details for Bug 85204 – Split off separate radeon_gart_get_page_entry ASIC hook

[patch] Split off separate radeon_gart_get_page_entry ASIC hook

0001-drm-radeon-Split-off-separate-radeon_gart_get_page_e.patch (text/plain), 10.98 KB, created by Michel Dänzer on 2015-01-20 10:15:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2015-01-20 10:15:24 UTC

Size: 10.98 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>index 54529b8..f345618 100644
>--- a/drivers/gpu/drm/radeon/radeon.h
>+++ b/drivers/gpu/drm/radeon/radeon.h
>@@ -242,6 +242,7 @@ bool radeon_get_bios(struct radeon_device *rdev);
>  * Dummy page
>  */
> struct radeon_dummy_page {
>+	u64		entry;
> 	struct page	*page;
> 	dma_addr_t	addr;
> };
>@@ -646,6 +647,7 @@ struct radeon_gart {
> 	unsigned			table_size;
> 	struct page			**pages;
> 	dma_addr_t			*pages_addr;
>+	dma_addr_t			*pages_entry;
> 	bool				ready;
> };
> 
>@@ -1847,8 +1849,9 @@ struct radeon_asic {
> 	/* gart */
> 	struct {
> 		void (*tlb_flush)(struct radeon_device *rdev);
>+		uint64_t (*get_page_entry)(uint64_t addr, uint32_t flags);
> 		void (*set_page)(struct radeon_device *rdev, unsigned i,
>-				 uint64_t addr, uint32_t flags);
>+				 uint64_t entry);
> 	} gart;
> 	struct {
> 		int (*init)(struct radeon_device *rdev);
>@@ -2852,7 +2855,8 @@ static inline void radeon_ring_write(struct radeon_ring *ring, uint32_t v)
> #define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
> #define radeon_asic_reset(rdev) (rdev)->asic->asic_reset((rdev))
> #define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart.tlb_flush((rdev))
>-#define radeon_gart_set_page(rdev, i, p, f) (rdev)->asic->gart.set_page((rdev), (i), (p), (f))
>+#define radeon_gart_get_page_entry(a, f) (rdev)->asic->gart.get_page_entry((a), (f))
>+#define radeon_gart_set_page(rdev, i, e) (rdev)->asic->gart.set_page((rdev), (i), (e))
> #define radeon_asic_vm_init(rdev) (rdev)->asic->vm.init((rdev))
> #define radeon_asic_vm_fini(rdev) (rdev)->asic->vm.fini((rdev))
> #define radeon_asic_vm_copy_pages(rdev, ib, pe, src, count) ((rdev)->asic->vm.copy_pages((rdev), (ib), (pe), (src), (count)))
>diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
>index 850de57..e74185a 100644
>--- a/drivers/gpu/drm/radeon/radeon_asic.c
>+++ b/drivers/gpu/drm/radeon/radeon_asic.c
>@@ -609,6 +609,7 @@ static struct radeon_asic rs600_asic = {
> 	.mc_wait_for_idle = &rs600_mc_wait_for_idle,
> 	.gart = {
> 		.tlb_flush = &rs600_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -905,6 +906,7 @@ static struct radeon_asic r600_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &r600_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -990,6 +992,7 @@ static struct radeon_asic rv6xx_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &r600_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -1081,6 +1084,7 @@ static struct radeon_asic rs780_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &r600_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -1185,6 +1189,7 @@ static struct radeon_asic rv770_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &r600_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -1303,6 +1308,7 @@ static struct radeon_asic evergreen_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &evergreen_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -1395,6 +1401,7 @@ static struct radeon_asic sumo_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &evergreen_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -1486,6 +1493,7 @@ static struct radeon_asic btc_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &evergreen_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.ring = {
>@@ -1621,6 +1629,7 @@ static struct radeon_asic cayman_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &cayman_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.vm = {
>@@ -1724,6 +1733,7 @@ static struct radeon_asic trinity_asic = {
> 	.get_gpu_clock_counter = &r600_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &cayman_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.vm = {
>@@ -1857,6 +1867,7 @@ static struct radeon_asic si_asic = {
> 	.get_gpu_clock_counter = &si_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &si_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.vm = {
>@@ -2018,6 +2029,7 @@ static struct radeon_asic ci_asic = {
> 	.get_gpu_clock_counter = &cik_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &cik_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.vm = {
>@@ -2125,6 +2137,7 @@ static struct radeon_asic kv_asic = {
> 	.get_gpu_clock_counter = &cik_get_gpu_clock_counter,
> 	.gart = {
> 		.tlb_flush = &cik_pcie_gart_tlb_flush,
>+		.get_page_entry = &rs600_gart_get_page_entry,
> 		.set_page = &rs600_gart_set_page,
> 	},
> 	.vm = {
>diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
>index 2a45d54..106da85 100644
>--- a/drivers/gpu/drm/radeon/radeon_asic.h
>+++ b/drivers/gpu/drm/radeon/radeon_asic.h
>@@ -232,8 +232,9 @@ int rs600_irq_process(struct radeon_device *rdev);
> void rs600_irq_disable(struct radeon_device *rdev);
> u32 rs600_get_vblank_counter(struct radeon_device *rdev, int crtc);
> void rs600_gart_tlb_flush(struct radeon_device *rdev);
>+uint64_t rs600_gart_get_page_entry(uint64_t addr, uint32_t flags);
> void rs600_gart_set_page(struct radeon_device *rdev, unsigned i,
>-			 uint64_t addr, uint32_t flags);
>+			 uint64_t entry);
> uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg);
> void rs600_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
> void rs600_bandwidth_update(struct radeon_device *rdev);
>diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
>index 0ec6516..bd7519f 100644
>--- a/drivers/gpu/drm/radeon/radeon_device.c
>+++ b/drivers/gpu/drm/radeon/radeon_device.c
>@@ -774,6 +774,8 @@ int radeon_dummy_page_init(struct radeon_device *rdev)
> 		rdev->dummy_page.page = NULL;
> 		return -ENOMEM;
> 	}
>+	rdev->dummy_page.entry = radeon_gart_get_page_entry(rdev->dummy_page.addr,
>+							    RADEON_GART_PAGE_DUMMY);
> 	return 0;
> }
> 
>diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
>index 84146d5..dd368ec 100644
>--- a/drivers/gpu/drm/radeon/radeon_gart.c
>+++ b/drivers/gpu/drm/radeon/radeon_gart.c
>@@ -228,7 +228,6 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
> 	unsigned t;
> 	unsigned p;
> 	int i, j;
>-	u64 page_base;
> 
> 	if (!rdev->gart.ready) {
> 		WARN(1, "trying to unbind memory from uninitialized GART !\n");
>@@ -240,13 +239,12 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
> 		if (rdev->gart.pages[p]) {
> 			rdev->gart.pages[p] = NULL;
> 			rdev->gart.pages_addr[p] = rdev->dummy_page.addr;
>-			page_base = rdev->gart.pages_addr[p];
> 			for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {
>+				rdev->gart.pages_entry[t] = rdev->dummy_page.entry;
> 				if (rdev->gart.ptr) {
>-					radeon_gart_set_page(rdev, t, page_base,
>-							     RADEON_GART_PAGE_DUMMY);
>+					radeon_gart_set_page(rdev, t,
>+							     rdev->dummy_page.entry);
> 				}
>-				page_base += RADEON_GPU_PAGE_SIZE;
> 			}
> 		}
> 	}
>@@ -274,7 +272,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
> {
> 	unsigned t;
> 	unsigned p;
>-	uint64_t page_base;
>+	uint64_t page_base, page_entry;
> 	int i, j;
> 
> 	if (!rdev->gart.ready) {
>@@ -287,12 +285,14 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
> 	for (i = 0; i < pages; i++, p++) {
> 		rdev->gart.pages_addr[p] = dma_addr[i];
> 		rdev->gart.pages[p] = pagelist[i];
>-		if (rdev->gart.ptr) {
>-			page_base = rdev->gart.pages_addr[p];
>-			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;
>+		page_base = dma_addr[i];
>+		for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {
>+			page_entry = radeon_gart_get_page_entry(page_base, flags);
>+			rdev->gart.pages_entry[t] = page_entry;
>+			if (rdev->gart.ptr) {
>+				radeon_gart_set_page(rdev, t, page_entry);
> 			}
>+			page_base += RADEON_GPU_PAGE_SIZE;
> 		}
> 	}
> 	mb();
>@@ -340,10 +340,17 @@ int radeon_gart_init(struct radeon_device *rdev)
> 		radeon_gart_fini(rdev);
> 		return -ENOMEM;
> 	}
>+	rdev->gart.pages_entry = vzalloc(sizeof(dma_addr_t) *
>+					 rdev->gart.num_gpu_pages);
>+	if (rdev->gart.pages_entry == NULL) {
>+		radeon_gart_fini(rdev);
>+		return -ENOMEM;
>+	}
> 	/* set GART entry to point to the dummy page by default */
>-	for (i = 0; i < rdev->gart.num_cpu_pages; i++) {
>+	for (i = 0; i < rdev->gart.num_cpu_pages; i++)
> 		rdev->gart.pages_addr[i] = rdev->dummy_page.addr;
>-	}
>+	for (i = 0; i < rdev->gart.num_gpu_pages; i++)
>+		rdev->gart.pages_entry[i] = rdev->dummy_page.entry;
> 	return 0;
> }
> 
>@@ -356,15 +363,17 @@ int radeon_gart_init(struct radeon_device *rdev)
>  */
> void radeon_gart_fini(struct radeon_device *rdev)
> {
>-	if (rdev->gart.pages && rdev->gart.pages_addr && rdev->gart.ready) {
>+	if (rdev->gart.pages && rdev->gart.pages_entry && rdev->gart.ready) {
> 		/* unbind pages */
> 		radeon_gart_unbind(rdev, 0, rdev->gart.num_cpu_pages);
> 	}
> 	rdev->gart.ready = false;
> 	vfree(rdev->gart.pages);
> 	vfree(rdev->gart.pages_addr);
>+	vfree(rdev->gart.pages_entry);
> 	rdev->gart.pages = NULL;
> 	rdev->gart.pages_addr = NULL;
>+	rdev->gart.pages_entry = NULL;
> 
> 	radeon_dummy_page_fini(rdev);
> }
>diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
>index 9acb1c3..edb6193 100644
>--- a/drivers/gpu/drm/radeon/rs600.c
>+++ b/drivers/gpu/drm/radeon/rs600.c
>@@ -625,11 +625,8 @@ static void rs600_gart_fini(struct radeon_device *rdev)
> 	radeon_gart_table_vram_free(rdev);
> }
> 
>-void rs600_gart_set_page(struct radeon_device *rdev, unsigned i,
>-			 uint64_t addr, uint32_t flags)
>+uint64_t rs600_gart_get_page_entry(uint64_t addr, uint32_t flags)
> {
>-	void __iomem *ptr = (void *)rdev->gart.ptr;
>-
> 	addr = addr & 0xFFFFFFFFFFFFF000ULL;
> 	addr |= R600_PTE_SYSTEM;
> 	if (flags & RADEON_GART_PAGE_VALID)
>@@ -640,7 +637,15 @@ void rs600_gart_set_page(struct radeon_device *rdev, unsigned i,
> 		addr |= R600_PTE_WRITEABLE;
> 	if (flags & RADEON_GART_PAGE_SNOOP)
> 		addr |= R600_PTE_SNOOPED;
>-	writeq(addr, ptr + (i * 8));
>+	return addr;
>+}
>+
>+void rs600_gart_set_page(struct radeon_device *rdev, unsigned i,
>+			 uint64_t entry)
>+{
>+	void __iomem *ptr = (void *)rdev->gart.ptr;
>+
>+	writeq(entry, ptr + (i * 8));
> }
> 
> int rs600_irq_set(struct radeon_device *rdev)
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 85204: 108069 | 108070 | 108071 | 111361 | 111376 | 112529 | 112530

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.