diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0473-drm-amdgpu-Mark-all-instances-of-struct-drm_info_lis.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0473-drm-amdgpu-Mark-all-instances-of-struct-drm_info_lis.patch | 158 |
1 files changed, 158 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0473-drm-amdgpu-Mark-all-instances-of-struct-drm_info_lis.patch b/common/recipes-kernel/linux/files/0473-drm-amdgpu-Mark-all-instances-of-struct-drm_info_lis.patch new file mode 100644 index 00000000..da563741 --- /dev/null +++ b/common/recipes-kernel/linux/files/0473-drm-amdgpu-Mark-all-instances-of-struct-drm_info_lis.patch @@ -0,0 +1,158 @@ +From 6e4217012f969149642277260cf566d5267930ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= <nils.wallmenius@gmail.com> +Date: Sun, 10 Apr 2016 16:30:01 +0200 +Subject: [PATCH 0473/1110] drm/amdgpu: Mark all instances of struct + drm_info_list as const +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +All these are compile time constand and the +drm_debugfs_create/remove_files functions take a const +pointer argument. + +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + 8 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index e7c1623..7fe432d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1705,12 +1705,12 @@ static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {} + * Debugfs + */ + struct amdgpu_debugfs { +- struct drm_info_list *files; ++ const struct drm_info_list *files; + unsigned num_files; + }; + + int amdgpu_debugfs_add_files(struct amdgpu_device *adev, +- struct drm_info_list *files, ++ const struct drm_info_list *files, + unsigned nfiles); + int amdgpu_debugfs_fence_init(struct amdgpu_device *adev); + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index fd52a04..8ff3286 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2016,7 +2016,7 @@ void amdgpu_get_pcie_info(struct amdgpu_device *adev) + * Debugfs + */ + int amdgpu_debugfs_add_files(struct amdgpu_device *adev, +- struct drm_info_list *files, ++ const struct drm_info_list *files, + unsigned nfiles) + { + unsigned i; +@@ -2187,7 +2187,7 @@ static int amdgpu_debugfs_print_status(struct seq_file *m, void *data) + return 0; + } + +-static struct drm_info_list amdgpu_debugfs_status_list[] = { ++static const struct drm_info_list amdgpu_debugfs_status_list[] = { + {"amdgpu_print_status", &amdgpu_debugfs_print_status, 0, NULL}, + }; + #endif +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +index d81f1f4..100f4c6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +@@ -639,7 +639,7 @@ static int amdgpu_debugfs_gpu_reset(struct seq_file *m, void *data) + return 0; + } + +-static struct drm_info_list amdgpu_debugfs_fence_list[] = { ++static const struct drm_info_list amdgpu_debugfs_fence_list[] = { + {"amdgpu_fence_info", &amdgpu_debugfs_fence_info, 0, NULL}, + {"amdgpu_gpu_reset", &amdgpu_debugfs_gpu_reset, 0, NULL} + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +index f5d53b3..75edc9d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +@@ -797,7 +797,7 @@ static int amdgpu_debugfs_gem_info(struct seq_file *m, void *data) + return 0; + } + +-static struct drm_info_list amdgpu_debugfs_gem_list[] = { ++static const struct drm_info_list amdgpu_debugfs_gem_list[] = { + {"amdgpu_gem_info", &amdgpu_debugfs_gem_info, 0, NULL}, + }; + #endif +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +index 209ab99..146b55e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +@@ -325,7 +325,7 @@ static int amdgpu_debugfs_sa_info(struct seq_file *m, void *data) + + } + +-static struct drm_info_list amdgpu_debugfs_sa_list[] = { ++static const struct drm_info_list amdgpu_debugfs_sa_list[] = { + {"amdgpu_sa_info", &amdgpu_debugfs_sa_info, 0, NULL}, + }; + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index ff9597c..6d44d4a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -1212,7 +1212,7 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data) + return 0; + } + +-static struct drm_info_list amdgpu_pm_info_list[] = { ++static const struct drm_info_list amdgpu_pm_info_list[] = { + {"amdgpu_pm_info", amdgpu_debugfs_pm_info, 0, NULL}, + }; + #endif +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +index dd79243..7bd31ae 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +@@ -427,7 +427,7 @@ static int r600_uvd_index = offsetof(struct amdgpu_device, uvd.ring); + static int si_vce1_index = offsetof(struct amdgpu_device, vce.ring[0]); + static int si_vce2_index = offsetof(struct amdgpu_device, vce.ring[1]); + +-static struct drm_info_list amdgpu_debugfs_ring_info_list[] = { ++static const struct drm_info_list amdgpu_debugfs_ring_info_list[] = { + {"amdgpu_ring_gfx", amdgpu_debugfs_ring_info, 0, &amdgpu_gfx_index}, + {"amdgpu_ring_cp1", amdgpu_debugfs_ring_info, 0, &cayman_cp1_index}, + {"amdgpu_ring_cp2", amdgpu_debugfs_ring_info, 0, &cayman_cp2_index}, +@@ -445,7 +445,7 @@ static int amdgpu_debugfs_ring_init(struct amdgpu_device *adev, struct amdgpu_ri + #if defined(CONFIG_DEBUG_FS) + unsigned i; + for (i = 0; i < ARRAY_SIZE(amdgpu_debugfs_ring_info_list); ++i) { +- struct drm_info_list *info = &amdgpu_debugfs_ring_info_list[i]; ++ const struct drm_info_list *info = &amdgpu_debugfs_ring_info_list[i]; + int roffset = *(int*)amdgpu_debugfs_ring_info_list[i].data; + struct amdgpu_ring *other = (void *)(((uint8_t*)adev) + roffset); + unsigned r; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index 228ccab..07fb3b3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -1175,7 +1175,7 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data) + static int ttm_pl_vram = TTM_PL_VRAM; + static int ttm_pl_tt = TTM_PL_TT; + +-static struct drm_info_list amdgpu_ttm_debugfs_list[] = { ++static const struct drm_info_list amdgpu_ttm_debugfs_list[] = { + {"amdgpu_vram_mm", amdgpu_mm_dump_table, 0, &ttm_pl_vram}, + {"amdgpu_gtt_mm", amdgpu_mm_dump_table, 0, &ttm_pl_tt}, + {"ttm_page_pool", ttm_page_alloc_debugfs, 0, NULL}, +-- +2.7.4 + |