aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0007-drm-radeon-use-new-TTM-populate-dma-map-helper-funct.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0007-drm-radeon-use-new-TTM-populate-dma-map-helper-funct.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0007-drm-radeon-use-new-TTM-populate-dma-map-helper-funct.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0007-drm-radeon-use-new-TTM-populate-dma-map-helper-funct.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0007-drm-radeon-use-new-TTM-populate-dma-map-helper-funct.patch
new file mode 100644
index 00000000..e56c7396
--- /dev/null
+++ b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0007-drm-radeon-use-new-TTM-populate-dma-map-helper-funct.patch
@@ -0,0 +1,83 @@
+From 078a8af6f60a8848598708b02e15ec59bb782674 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Fri, 18 Aug 2017 10:06:34 -0400
+Subject: [PATCH 0007/4131] drm/radeon: use new TTM populate/dma map helper
+ functions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/radeon/radeon_ttm.c | 33 ++-------------------------------
+ 1 file changed, 2 insertions(+), 31 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
+index bf69bf9..8032da5 100644
+--- a/drivers/gpu/drm/radeon/radeon_ttm.c
++++ b/drivers/gpu/drm/radeon/radeon_ttm.c
+@@ -725,8 +725,6 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
+ {
+ struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(ttm);
+ struct radeon_device *rdev;
+- unsigned i;
+- int r;
+ bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
+
+ if (ttm->state != tt_unpopulated)
+@@ -762,33 +760,13 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
+ }
+ #endif
+
+- r = ttm_pool_populate(ttm);
+- if (r) {
+- return r;
+- }
+-
+- for (i = 0; i < ttm->num_pages; i++) {
+- gtt->ttm.dma_address[i] = pci_map_page(rdev->pdev, ttm->pages[i],
+- 0, PAGE_SIZE,
+- PCI_DMA_BIDIRECTIONAL);
+- if (pci_dma_mapping_error(rdev->pdev, gtt->ttm.dma_address[i])) {
+- while (i--) {
+- pci_unmap_page(rdev->pdev, gtt->ttm.dma_address[i],
+- PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+- gtt->ttm.dma_address[i] = 0;
+- }
+- ttm_pool_unpopulate(ttm);
+- return -EFAULT;
+- }
+- }
+- return 0;
++ return ttm_populate_and_map_pages(rdev->dev, &gtt->ttm);
+ }
+
+ static void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm)
+ {
+ struct radeon_device *rdev;
+ struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(ttm);
+- unsigned i;
+ bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
+
+ if (gtt && gtt->userptr) {
+@@ -815,14 +793,7 @@ static void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm)
+ }
+ #endif
+
+- for (i = 0; i < ttm->num_pages; i++) {
+- if (gtt->ttm.dma_address[i]) {
+- pci_unmap_page(rdev->pdev, gtt->ttm.dma_address[i],
+- PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+- }
+- }
+-
+- ttm_pool_unpopulate(ttm);
++ ttm_unmap_and_unpopulate_pages(rdev->dev, &gtt->ttm);
+ }
+
+ int radeon_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,
+--
+2.7.4
+