diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2846-drm-amdgpu-cleanup-debugfs-handling-a-bit.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2846-drm-amdgpu-cleanup-debugfs-handling-a-bit.patch | 141 |
1 files changed, 141 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2846-drm-amdgpu-cleanup-debugfs-handling-a-bit.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2846-drm-amdgpu-cleanup-debugfs-handling-a-bit.patch new file mode 100644 index 00000000..ec18fd47 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2846-drm-amdgpu-cleanup-debugfs-handling-a-bit.patch @@ -0,0 +1,141 @@ +From c575fffd621af0460df04f6446aaa6a8a299d633 Mon Sep 17 00:00:00 2001 +From: Christian Koenig <christian.koenig@amd.com> +Date: Wed, 6 Dec 2017 15:44:51 +0100 +Subject: [PATCH 2846/4131] drm/amdgpu: cleanup debugfs handling a bit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Remove the superflous .debugfs_init callback and register all files in +amdgpu_device.c in just one function. + +Change-Id: Id24ed52bf746123ae6372bdf5af43cfcb7c60606 +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 46 +++++++----------------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - + 3 files changed, 11 insertions(+), 37 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 86a3ea7..2bfd570 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1276,7 +1276,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev, + int amdgpu_debugfs_fence_init(struct amdgpu_device *adev); + + #if defined(CONFIG_DEBUG_FS) +-int amdgpu_debugfs_init(struct drm_minor *minor); + #endif + + int amdgpu_debugfs_firmware_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 33ecb9ca..7f330f0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -66,8 +66,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin"); + + static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev); + static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev); +-static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev); +-static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev); ++static int amdgpu_debugfs_init(struct amdgpu_device *adev); + + static const char *amdgpu_asic_name[] = { + "TAHITI", +@@ -2356,17 +2355,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, + if (r) + DRM_ERROR("registering register debugfs failed (%d).\n", r); + +- r = amdgpu_debugfs_test_ib_ring_init(adev); +- if (r) +- DRM_ERROR("registering register test ib ring debugfs failed (%d).\n", r); +- + r = amdgpu_debugfs_firmware_init(adev); + if (r) + DRM_ERROR("registering firmware debugfs failed (%d).\n", r); + +- r = amdgpu_debugfs_vbios_dump_init(adev); ++ r = amdgpu_debugfs_init(adev); + if (r) +- DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r); ++ DRM_ERROR("Creating debugfs files failed (%d).\n", r); + + if ((amdgpu_testing & 1)) { + if (adev->accel_working) +@@ -3941,21 +3936,6 @@ static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data) + return 0; + } + +-static const struct drm_info_list amdgpu_debugfs_test_ib_ring_list[] = { +- {"amdgpu_test_ib", &amdgpu_debugfs_test_ib} +-}; +- +-static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev) +-{ +- return amdgpu_debugfs_add_files(adev, +- amdgpu_debugfs_test_ib_ring_list, 1); +-} +- +-int amdgpu_debugfs_init(struct drm_minor *minor) +-{ +- return 0; +-} +- + static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) + { + struct drm_info_node *node = (struct drm_info_node *) m->private; +@@ -3966,19 +3946,19 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) + return 0; + } + +-static const struct drm_info_list amdgpu_vbios_dump_list[] = { +- {"amdgpu_vbios", +- amdgpu_debugfs_get_vbios_dump, +- 0, NULL}, ++static const struct drm_info_list amdgpu_debugfs_list[] = { ++ {"amdgpu_vbios", amdgpu_debugfs_get_vbios_dump}, ++ {"amdgpu_test_ib", &amdgpu_debugfs_test_ib} + }; + +-static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) ++static int amdgpu_debugfs_init(struct amdgpu_device *adev) + { +- return amdgpu_debugfs_add_files(adev, +- amdgpu_vbios_dump_list, 1); ++ return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list, ++ ARRAY_SIZE(amdgpu_debugfs_list)); + } ++ + #else +-static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev) ++static int amdgpu_debugfs_init(struct amdgpu_device *adev) + { + return 0; + } +@@ -3986,9 +3966,5 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) + { + return 0; + } +-static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev) +-{ +- return 0; +-} + static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev) { } + #endif +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index d80e695..43c42c7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -838,7 +838,6 @@ static struct drm_driver kms_driver = { + .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, + .get_scanout_position = amdgpu_get_crtc_scanout_position, + #if defined(CONFIG_DEBUG_FS) +- .debugfs_init = amdgpu_debugfs_init, + #endif + .irq_preinstall = amdgpu_irq_preinstall, + .irq_postinstall = amdgpu_irq_postinstall, +-- +2.7.4 + |