projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: efe0b66)
gpu: arm: r15p0/r12p0: fix compilation without MALI_EXYNOS_TRACE
authorChristopher N. Hesse <raymanfx@gmail.com>
Sat, 30 Jul 2016 20:00:05 +0000 (22:00 +0200)
committerStricted <info@stricted.net>
Thu, 11 Oct 2018 16:03:49 +0000 (18:03 +0200)
Change-Id: Iba1d6d5929a1511b021ed2a25267d2af582dbdde

drivers/gpu/arm/t7xx/r12p0/mali_kbase_core_linux.c patch | blob | blame | history
drivers/gpu/arm/t7xx/r15p0/mali_kbase_core_linux.c patch | blob | blame | history

diff --git a/drivers/gpu/arm/t7xx/r12p0/mali_kbase_core_linux.c b/drivers/gpu/arm/t7xx/r12p0/mali_kbase_core_linux.c
index 3d91138b37a8510a28040db78282982418edd36d..1b3fa3d56d7c7a0fd68ade7835e31b21d1692fd1 100644 (file)
--- a/drivers/gpu/arm/t7xx/r12p0/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/t7xx/r12p0/mali_kbase_core_linux.c
@@ -3515,9 +3515,11 @@ static int kbase_device_debugfs_init(struct kbase_device *kbdev)
        kbdev->debugfs_ctx_directory = debugfs_create_dir("ctx",
                        kbdev->mali_debugfs_directory);
 #else
+#ifdef CONFIG_MALI_EXYNOS_TRACE
        kbdev->trace_dentry = debugfs_create_file("mali_trace", S_IRUGO,
                        kbdev->mali_debugfs_directory, kbdev,
                        &kbasep_trace_debugfs_fops);
+#endif
 
        kbdev->debugfs_ctx_directory = debugfs_create_dir("mem",
                        kbdev->mali_debugfs_directory);
diff --git a/drivers/gpu/arm/t7xx/r15p0/mali_kbase_core_linux.c b/drivers/gpu/arm/t7xx/r15p0/mali_kbase_core_linux.c
index dca4ca3b5a2a1a2031bf79d51cddd69ac3f5f0a5..5e370bad4ad38c4308713dedfec89f10a37f5e95 100644 (file)
--- a/drivers/gpu/arm/t7xx/r15p0/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/t7xx/r15p0/mali_kbase_core_linux.c
@@ -3471,9 +3471,11 @@ static int kbase_device_debugfs_init(struct kbase_device *kbdev)
        kbdev->debugfs_ctx_directory = debugfs_create_dir("ctx",
                        kbdev->mali_debugfs_directory);
 #else
+#ifdef CONFIG_MALI_EXYNOS_TRACE
        kbdev->trace_dentry = debugfs_create_file("mali_trace", S_IRUGO,
                        kbdev->mali_debugfs_directory, kbdev,
                        &kbasep_trace_debugfs_fops);
+#endif
 
        kbdev->debugfs_ctx_directory = debugfs_create_dir("mem",
                        kbdev->mali_debugfs_directory);