From: Jiyu Yang <jiyu.yang@amlogic.com>
Date: Thu, 11 Jan 2018 04:53:06 +0000 (+0800)
Subject: gpu: fixed the fence struct since 4.9.68
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=547c84b2dce5d47aed3551c79d9cfb32d9d074ea;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_mali-driver.git

gpu: fixed the fence struct since 4.9.68

PD#151803

Change-Id: I265692a3c6fa4ad3ea4dda8b79c6dcd28f8a4ac5
---

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 9e027fc..32243a9 100644
--- 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