diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1836-drm-amd-amdgpu-remove-usage-of-ttm-trace.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1836-drm-amd-amdgpu-remove-usage-of-ttm-trace.patch | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1836-drm-amd-amdgpu-remove-usage-of-ttm-trace.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1836-drm-amd-amdgpu-remove-usage-of-ttm-trace.patch new file mode 100644 index 00000000..8ea0f39a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1836-drm-amd-amdgpu-remove-usage-of-ttm-trace.patch @@ -0,0 +1,110 @@ +From 390f0ed82fa220271dc583d7f440216f6b102321 Mon Sep 17 00:00:00 2001 +From: Tom St Denis <tom.stdenis@amd.com> +Date: Mon, 18 Sep 2017 08:10:00 -0400 +Subject: [PATCH 1836/4131] drm/amd/amdgpu: remove usage of ttm trace +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> + + Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c + +Change-Id: I03cc0d40f0f90a33ce3cf1ea3edba510896e40bd +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 33 ++------------------------------- + 1 file changed, 2 insertions(+), 31 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index 4daaacd..e6cae02 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -34,7 +34,6 @@ + #include <drm/ttm/ttm_placement.h> + #include <drm/ttm/ttm_module.h> + #include <drm/ttm/ttm_page_alloc.h> +-#include <drm/ttm/ttm_debug.h> + #include <drm/drmP.h> + #include <drm/amdgpu_drm.h> + #include <linux/seq_file.h> +@@ -770,22 +769,6 @@ void amdgpu_ttm_tt_mark_user_pages(struct ttm_tt *ttm) + } + } + +-static void amdgpu_trace_dma_map(struct ttm_tt *ttm) +-{ +- struct amdgpu_device *adev = amdgpu_ttm_adev(ttm->bdev); +- struct amdgpu_ttm_tt *gtt = (void *)ttm; +- +- ttm_trace_dma_map(adev->dev, >t->ttm); +-} +- +-static void amdgpu_trace_dma_unmap(struct ttm_tt *ttm) +-{ +- struct amdgpu_device *adev = amdgpu_ttm_adev(ttm->bdev); +- struct amdgpu_ttm_tt *gtt = (void *)ttm; +- +- ttm_trace_dma_unmap(adev->dev, >t->ttm); +-} +- + /* prepare the sg table with the user pages */ + static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) + { +@@ -812,8 +795,6 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) + drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages, + gtt->ttm.dma_address, ttm->num_pages); + +- amdgpu_trace_dma_map(ttm); +- + return 0; + + release_sg: +@@ -839,8 +820,6 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) + + amdgpu_ttm_tt_mark_user_pages(ttm); + +- amdgpu_trace_dma_unmap(ttm); +- + sg_free_table(ttm->sg); + } + +@@ -1024,7 +1003,6 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm) + { + struct amdgpu_device *adev = amdgpu_ttm_adev(ttm->bdev); + struct amdgpu_ttm_tt *gtt = (void *)ttm; +- int r; + bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); + + if (ttm->state != tt_unpopulated) +@@ -1044,15 +1022,10 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm) + drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages, + gtt->ttm.dma_address, ttm->num_pages); + ttm->state = tt_unbound; +- r = 0; +- goto trace_mappings; ++ return 0; + } + +- r = ttm_populate_and_map_pages(adev->dev, >t->ttm); +-trace_mappings: +- if (likely(!r)) +- amdgpu_trace_dma_map(ttm); +- return r; ++ return ttm_populate_and_map_pages(adev->dev, >t->ttm); + } + + static void amdgpu_ttm_tt_unpopulate(struct ttm_tt *ttm) +@@ -1073,8 +1046,6 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_tt *ttm) + + adev = amdgpu_ttm_adev(ttm->bdev); + +- amdgpu_trace_dma_unmap(ttm); +- + ttm_unmap_and_unpopulate_pages(adev->dev, >t->ttm); + } + +-- +2.7.4 + |