Attachment 55095 Details for Bug 43719 – Fix agp on top of ttm tt rework

[patch] Fix agp on top of ttm tt rework

0001-ttm-fix-agp-since-ttm-tt-rework.patch (text/plain), 4.65 KB, created by Jerome Glisse on 2012-01-03 14:40:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jerome Glisse

Created: 2012-01-03 14:40:19 UTC

Size: 4.65 KB

patch

obsolete

>From 99a6eee89a43bce155a93ab6d71ea041aac10680 Mon Sep 17 00:00:00 2001
>From: Jerome Glisse <jglisse@redhat.com>
>Date: Tue, 3 Jan 2012 17:37:37 -0500
>Subject: [PATCH] ttm: fix agp since ttm tt rework
>
>ttm tt rework modified the way we allocate and populate the
>ttm_tt structure, the AGP side was missing some bit to properly
>work. Fix those and fix radeon and nouveau AGP support.
>
>Tested on radeon only so far.
>
>Signed-off-by: Jerome Glisse <jglisse@redhat.com>
>---
> drivers/gpu/drm/nouveau/nouveau_bo.c  |   13 +++++++++++++
> drivers/gpu/drm/radeon/radeon_ttm.c   |   11 +++++++++++
> drivers/gpu/drm/ttm/ttm_agp_backend.c |   17 +++++++++++++++++
> drivers/gpu/drm/ttm/ttm_tt.c          |    2 ++
> include/drm/ttm/ttm_bo_driver.h       |    2 ++
> 5 files changed, 45 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
>index 8cf4a48..724b41a 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
>@@ -1066,6 +1066,12 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm)
> 	dev_priv = nouveau_bdev(ttm->bdev);
> 	dev = dev_priv->dev;
> 
>+#if __OS_HAS_AGP
>+	if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) {
>+		return ttm_agp_tt_populate(ttm);
>+	}
>+#endif
>+
> #ifdef CONFIG_SWIOTLB
> 	if (swiotlb_nr_tbl()) {
> 		return ttm_dma_populate((void *)ttm, dev->dev);
>@@ -1105,6 +1111,13 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
> 	dev_priv = nouveau_bdev(ttm->bdev);
> 	dev = dev_priv->dev;
> 
>+#if __OS_HAS_AGP
>+	if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) {
>+		ttm_agp_tt_unpopulate(ttm);
>+		return;
>+	}
>+#endif
>+
> #ifdef CONFIG_SWIOTLB
> 	if (swiotlb_nr_tbl()) {
> 		ttm_dma_unpopulate((void *)ttm, dev->dev);
>diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
>index b0ebaf8..dc73d77 100644
>--- a/drivers/gpu/drm/radeon/radeon_ttm.c
>+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
>@@ -588,6 +588,11 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
> 		return 0;
> 
> 	rdev = radeon_get_rdev(ttm->bdev);
>+#if __OS_HAS_AGP
>+	if (rdev->flags & RADEON_IS_AGP) {
>+		return ttm_agp_tt_populate(ttm);
>+	}
>+#endif
> 
> #ifdef CONFIG_SWIOTLB
> 	if (swiotlb_nr_tbl()) {
>@@ -624,6 +629,12 @@ static void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm)
> 	unsigned i;
> 
> 	rdev = radeon_get_rdev(ttm->bdev);
>+#if __OS_HAS_AGP
>+	if (rdev->flags & RADEON_IS_AGP) {
>+		ttm_agp_tt_unpopulate(ttm);
>+		return;
>+	}
>+#endif
> 
> #ifdef CONFIG_SWIOTLB
> 	if (swiotlb_nr_tbl()) {
>diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c
>index 14ebd36..747c141 100644
>--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
>+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c
>@@ -31,6 +31,7 @@
> 
> #include "ttm/ttm_module.h"
> #include "ttm/ttm_bo_driver.h"
>+#include "ttm/ttm_page_alloc.h"
> #ifdef TTM_HAS_AGP
> #include "ttm/ttm_placement.h"
> #include <linux/agp_backend.h>
>@@ -97,6 +98,7 @@ static void ttm_agp_destroy(struct ttm_tt *ttm)
> 
> 	if (agp_be->mem)
> 		ttm_agp_unbind(ttm);
>+	ttm_tt_fini(ttm);
> 	kfree(agp_be);
> }
> 
>@@ -129,4 +131,19 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,
> }
> EXPORT_SYMBOL(ttm_agp_tt_create);
> 
>+int ttm_agp_tt_populate(struct ttm_tt *ttm)
>+{
>+	if (ttm->state != tt_unpopulated)
>+		return 0;
>+
>+	return ttm_pool_populate(ttm);
>+}
>+EXPORT_SYMBOL(ttm_agp_tt_populate);
>+
>+void ttm_agp_tt_unpopulate(struct ttm_tt *ttm)
>+{
>+	ttm_pool_unpopulate(ttm);
>+}
>+EXPORT_SYMBOL(ttm_agp_tt_unpopulate);
>+
> #endif
>diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
>index 58e1fa1..2f75d20 100644
>--- a/drivers/gpu/drm/ttm/ttm_tt.c
>+++ b/drivers/gpu/drm/ttm/ttm_tt.c
>@@ -191,6 +191,7 @@ int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev,
> 	ttm->page_flags = page_flags;
> 	ttm->dummy_read_page = dummy_read_page;
> 	ttm->state = tt_unpopulated;
>+	ttm->swap_storage = NULL;
> 
> 	ttm_tt_alloc_page_directory(ttm);
> 	if (!ttm->pages) {
>@@ -222,6 +223,7 @@ int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_bo_device *bdev,
> 	ttm->page_flags = page_flags;
> 	ttm->dummy_read_page = dummy_read_page;
> 	ttm->state = tt_unpopulated;
>+	ttm->swap_storage = NULL;
> 
> 	INIT_LIST_HEAD(&ttm_dma->pages_list);
> 	ttm_dma_tt_alloc_page_directory(ttm_dma);
>diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
>index 2be8891..d43e892 100644
>--- a/include/drm/ttm/ttm_bo_driver.h
>+++ b/include/drm/ttm/ttm_bo_driver.h
>@@ -1030,6 +1030,8 @@ extern struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,
> 					struct agp_bridge_data *bridge,
> 					unsigned long size, uint32_t page_flags,
> 					struct page *dummy_read_page);
>+int ttm_agp_tt_populate(struct ttm_tt *ttm);
>+void ttm_agp_tt_unpopulate(struct ttm_tt *ttm);
> #endif
> 
> #endif
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 43719: 55095

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.