gpu: fixed the fence struct since 4.9.68

PD#151803
Change-Id: I5617acd8880666cf4ad24812ab248b904de58e52

diff --git a/mali/linux/mali_internal_sync.c b/mali/linux/mali_internal_sync.c
index 43d34f1985296bb841e7d2b107846bbd92cdb12e..d8939dc457496919f7631c04844c5ae8ddd3b226 100644 (file)
--- a/mali/linux/mali_internal_sync.c
+++ b/mali/linux/mali_internal_sync.c
@@ -695,7 +695,7 @@ static bool mali_internal_fence_signaled(struct fence *fence)
 
        ret = parent->ops->has_signaled(sync_pt);
        if (0 > ret)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 68)
                fence->error = ret;
 #else
                fence->status = ret;

diff --git a/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence.h b/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence.h
index f3ed025f7f6ca9679aa598d2812f0de63a516475..d187e505700e138e380fa8b5647f54261dd83463 100644 (file)
--- a/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence.h
+++ b/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_fence.h
@@ -134,7 +134,7 @@ static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom)
 static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom,
                                         int status)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 68))
        katom->dma_fence.fence->error = status;
 #else
        katom->dma_fence.fence->status = status;

diff --git a/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
index ef5b7ce478b4bbed5cfbbd2009d0b2b45b95fae0..cb00c33ee6a8cad50c87e74b207a3ffc8cecb39c 100644 (file)
--- a/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
+++ b/t83x/kernel/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
@@ -161,7 +161,7 @@ static void kbase_fence_wait_callback(struct dma_fence *fence,
        struct kbase_context *kctx = katom->kctx;
 
        /* Cancel atom if fence is erroneous */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 68))
        if (dma_fence_is_signaled(kcb->fence) && kcb->fence->error)
 #else
        if (dma_fence_is_signaled(kcb->fence) && kcb->fence->status < 0)
@@ -277,7 +277,7 @@ static void kbase_sync_fence_info_get(struct dma_fence *fence,
         * 1 : signaled
         */
        if (dma_fence_is_signaled(fence)) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 68))
                int status = fence->error;
 #else
                int status = fence->status;