From: Kim Heejeong <h0725.kim@samsung.com>
Date: Fri, 23 Oct 2020 07:34:17 +0000 (+0900)
Subject: [RAMEN9610-21777]drivers: gpu: CFI Failure error fix for kbasep_soft_job_timeout_worker
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=243639decb88ead457528cbfddd839e3daee79c4;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[RAMEN9610-21777]drivers: gpu: CFI Failure error fix for kbasep_soft_job_timeout_worker

Change-Id: I02d039d3590bc91046bf4c3703e4db4285b9e495
Signed-off-by: Kim Heejeong <h0725.kim@samsung.com>
---

diff --git a/drivers/gpu/arm/b_r26p0/context/backend/mali_kbase_context_jm.c b/drivers/gpu/arm/b_r26p0/context/backend/mali_kbase_context_jm.c
index 818ae95b5829..0e5e2cf23f03 100644
--- a/drivers/gpu/arm/b_r26p0/context/backend/mali_kbase_context_jm.c
+++ b/drivers/gpu/arm/b_r26p0/context/backend/mali_kbase_context_jm.c
@@ -89,7 +89,11 @@ static void kbase_context_kbase_kinstr_jm_term(struct kbase_context *kctx)
 static int kbase_context_kbase_timer_setup(struct kbase_context *kctx)
 {
 	kbase_timer_setup(&kctx->soft_job_timeout,
-			  kbasep_soft_job_timeout_worker);
+#if KERNEL_VERSION(4, 15, 0) <= LINUX_VERSION_CODE
+			      kbasep_soft_job_timeout_worker);
+#else
+				  (void (*)(struct timer_list *))kbasep_soft_job_timeout_worker);
+#endif
 
 	return 0;
 }
diff --git a/drivers/gpu/arm/b_r26p0/mali_kbase.h b/drivers/gpu/arm/b_r26p0/mali_kbase.h
index 34bc91cdfcad..2814ea239fca 100644
--- a/drivers/gpu/arm/b_r26p0/mali_kbase.h
+++ b/drivers/gpu/arm/b_r26p0/mali_kbase.h
@@ -388,7 +388,11 @@ int kbase_soft_event_update(struct kbase_context *kctx,
 			    u64 event,
 			    unsigned char new_status);
 
+#if KERNEL_VERSION(4, 15, 0) <= LINUX_VERSION_CODE
 void kbasep_soft_job_timeout_worker(struct timer_list *timer);
+#else
+void kbasep_soft_job_timeout_worker(unsigned long data);
+#endif
 void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt);
 
 /* MALI_SEC_INTEGRATION */
diff --git a/drivers/gpu/arm/b_r26p0/mali_kbase_softjobs.c b/drivers/gpu/arm/b_r26p0/mali_kbase_softjobs.c
index 639278363427..a8e0b3862def 100644
--- a/drivers/gpu/arm/b_r26p0/mali_kbase_softjobs.c
+++ b/drivers/gpu/arm/b_r26p0/mali_kbase_softjobs.c
@@ -384,8 +384,16 @@ static void kbase_fence_debug_timeout(struct kbase_jd_atom *katom)
 }
 #endif /* CONFIG_MALI_FENCE_DEBUG */
 
+#if KERNEL_VERSION(4, 15, 0) <= LINUX_VERSION_CODE
 void kbasep_soft_job_timeout_worker(struct timer_list *timer)
+#else
+void kbasep_soft_job_timeout_worker(unsigned long data)
+#endif
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+	    struct timer_list *timer = (struct timer_list *)data;
+#endif
+
 	struct kbase_context *kctx = container_of(timer, struct kbase_context,
 			soft_job_timeout);
 	u32 timeout_ms = (u32)atomic_read(