projects / GitHub / LineageOS / G12 / android_hardware_amlogic_kernel-modules_mali-driver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3eb57f0)
gpu: fixed the fence struct since 4.9.68
authorJiyu Yang <jiyu.yang@amlogic.com>
Thu, 11 Jan 2018 04:53:06 +0000 (12:53 +0800)
committerSimon Zheng <simon.zheng@amlogic.com>
Thu, 8 Mar 2018 10:48:24 +0000 (02:48 -0800)
PD#151803

Change-Id: I265692a3c6fa4ad3ea4dda8b79c6dcd28f8a4ac5

t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h patch | blob | blame | history

diff --git a/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h b/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h
index 9e027fc11bd5409d6abcbcb25b59e1ead28ae62e..32243a9b2aaed0731641da4720b372b0b9dbf968 100644 (file)
--- a/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h
+++ b/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence_defs.h
@@ -39,7 +39,11 @@
 #define dma_fence_is_signaled(a) fence_is_signaled(a)
 #define dma_fence_add_callback(a, b, c) fence_add_callback(a, b, c)
 #define dma_fence_remove_callback(a, b) fence_remove_callback(a, b)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 68))
 #define dma_fence_get_status(a) (fence_is_signaled(a) ? (a)->status ?: 1 : 0)
+#else
+#define dma_fence_get_status(a) (fence_is_signaled(a) ? (a)->error ?: 1 : 0)
+#endif
 
 #else