aboutsummaryrefslogtreecommitdiffstats
path: root/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0008-yocto-amd-drm-radeon-cleanup-radeon_ttm-debugfs-handling.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-steppeeagle/recipes-kernel/linux/linux-yocto/0008-yocto-amd-drm-radeon-cleanup-radeon_ttm-debugfs-handling.patch')
-rw-r--r--meta-steppeeagle/recipes-kernel/linux/linux-yocto/0008-yocto-amd-drm-radeon-cleanup-radeon_ttm-debugfs-handling.patch109
1 files changed, 0 insertions, 109 deletions
diff --git a/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0008-yocto-amd-drm-radeon-cleanup-radeon_ttm-debugfs-handling.patch b/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0008-yocto-amd-drm-radeon-cleanup-radeon_ttm-debugfs-handling.patch
deleted file mode 100644
index bb62cdb6..00000000
--- a/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0008-yocto-amd-drm-radeon-cleanup-radeon_ttm-debugfs-handling.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From d1ed06d2f21d3e7b407e4b32739472b7210c95ed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Mon, 9 Dec 2013 06:50:21 -0700
-Subject: [PATCH 08/44] drm/radeon: cleanup radeon_ttm debugfs handling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise we not necessary export the right information.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
----
- drivers/gpu/drm/radeon/radeon_ttm.c | 59 ++++++++++++++---------------------
- 1 file changed, 23 insertions(+), 36 deletions(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
-index 71245d6..a2d6c4f 100644
---- a/drivers/gpu/drm/radeon/radeon_ttm.c
-+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -832,16 +832,15 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
- return 0;
- }
-
--
--#define RADEON_DEBUGFS_MEM_TYPES 2
--
- #if defined(CONFIG_DEBUG_FS)
-+
- static int radeon_mm_dump_table(struct seq_file *m, void *data)
- {
- struct drm_info_node *node = (struct drm_info_node *)m->private;
-- struct drm_mm *mm = (struct drm_mm *)node->info_ent->data;
-+ unsigned ttm_pl = *(int *)node->info_ent->data;
- struct drm_device *dev = node->minor->dev;
- struct radeon_device *rdev = dev->dev_private;
-+ struct drm_mm *mm = (struct drm_mm *)rdev->mman.bdev.man[ttm_pl].priv;
- int ret;
- struct ttm_bo_global *glob = rdev->mman.bdev.glob;
-
-@@ -850,46 +849,34 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
- spin_unlock(&glob->lru_lock);
- return ret;
- }
-+
-+static int ttm_pl_vram = TTM_PL_VRAM;
-+static int ttm_pl_tt = TTM_PL_TT;
-+
-+static struct drm_info_list radeon_ttm_debugfs_list[] = {
-+ {"radeon_vram_mm", radeon_mm_dump_table, 0, &ttm_pl_vram},
-+ {"radeon_gtt_mm", radeon_mm_dump_table, 0, &ttm_pl_tt},
-+ {"ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL},
-+#ifdef CONFIG_SWIOTLB
-+ {"ttm_dma_page_pool", ttm_dma_page_alloc_debugfs, 0, NULL}
-+#endif
-+};
-+
- #endif
-
- static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
- {
- #if defined(CONFIG_DEBUG_FS)
-- static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2];
-- static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32];
-- unsigned i;
-+ unsigned count = ARRAY_SIZE(radeon_ttm_debugfs_list);
-
-- for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
-- if (i == 0)
-- sprintf(radeon_mem_types_names[i], "radeon_vram_mm");
-- else
-- sprintf(radeon_mem_types_names[i], "radeon_gtt_mm");
-- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
-- radeon_mem_types_list[i].show = &radeon_mm_dump_table;
-- radeon_mem_types_list[i].driver_features = 0;
-- if (i == 0)
-- radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
-- else
-- radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
--
-- }
-- /* Add ttm page pool to debugfs */
-- sprintf(radeon_mem_types_names[i], "ttm_page_pool");
-- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
-- radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs;
-- radeon_mem_types_list[i].driver_features = 0;
-- radeon_mem_types_list[i++].data = NULL;
- #ifdef CONFIG_SWIOTLB
-- if (swiotlb_nr_tbl()) {
-- sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");
-- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
-- radeon_mem_types_list[i].show = &ttm_dma_page_alloc_debugfs;
-- radeon_mem_types_list[i].driver_features = 0;
-- radeon_mem_types_list[i++].data = NULL;
-- }
-+ if (!swiotlb_nr_tbl())
-+ --count;
- #endif
-- return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i);
-
--#endif
-+ return radeon_debugfs_add_files(rdev, radeon_ttm_debugfs_list, count);
-+#else
-+
- return 0;
-+#endif
- }
---
-1.7.9.5
-