wandboard-rt & kernel-module-imx-gpu-viv error

* wandboard-rt & kernel-module-imx-gpu-viv error
@ 2016-01-12  6:47 Julio Cruz Barroso
  2016-01-12 11:12 ` Otavio Salvador
  0 siblings, 1 reply; 9+ messages in thread
From: Julio Cruz Barroso @ 2016-01-12  6:47 UTC (permalink / raw)
  To: meta-freescale; +Cc: dominic.sacre

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

Hi,

I'm trying to build a core-image-minimal for "wandboard-rt", but an error show-up compiling the module "kernel-module-imx-gpu-viv". 

I found two ways to solve this issue:

1. Apply a similar patch proposed by Dominic some months ago ([meta-freescale] [meta-fsl-arm-extra][PATCH] linux-wandboard-rt: Add initial recipe), but this time, for the external module
2. Disable the kernel module and use the built-in. For this, it suggest to use the option defined by Otavio 5 month ago (patch-v2-0-5-dynamically-choose-between-built-in-or-external-vivante-gpu-kernel-driver#post8). MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE = "0" in the local.conf file.

Currently, both sources (module and built-in) have difference and I'm not sure if the applied patch will be enough. Dominic, do you have any comments?

Thanks for any suggestion,

Julio

[-- Attachment #2: 0001-fix-build-in-kernel-module.patch --]
[-- Type: application/octet-stream, Size: 2132 bytes --]

From e2a50627a1fc33ebda63c4a510ce5d9e2abb9df4 Mon Sep 17 00:00:00 2001
From: Julio Cruz <jcsistemas2001@gmail.com>
Date: Tue, 12 Jan 2016 14:26:17 +0800
Subject: [PATCH] fix build in kernel module

---
 .../hal/os/linux/kernel/gc_hal_kernel_os.c               | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_os.c b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_os.c
index 49c9745..af3300d 100644
--- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -7362,7 +7362,7 @@ gckOS_WaitSignal(
 
     might_sleep();
 
-    spin_lock_irq(&signal->obj.wait.lock);
+    raw_spin_lock_irq(&signal->obj.wait.lock);
 
     if (signal->obj.done)
     {
@@ -7384,9 +7384,8 @@ gckOS_WaitSignal(
             ? MAX_SCHEDULE_TIMEOUT
             : Wait * HZ / 1000;
 
-        DECLARE_WAITQUEUE(wait, current);
-        wait.flags |= WQ_FLAG_EXCLUSIVE;
-        __add_wait_queue_tail(&signal->obj.wait, &wait);
+	DEFINE_SWAITER(wait);
+	swait_prepare_locked(&signal->obj.wait, &wait);
 
         while (gcvTRUE)
         {
@@ -7398,9 +7397,9 @@ gckOS_WaitSignal(
             }
 
             __set_current_state(TASK_INTERRUPTIBLE);
-            spin_unlock_irq(&signal->obj.wait.lock);
+            raw_spin_unlock_irq(&signal->obj.wait.lock);
             timeout = schedule_timeout(timeout);
-            spin_lock_irq(&signal->obj.wait.lock);
+            raw_spin_lock_irq(&signal->obj.wait.lock);
 
             if (signal->obj.done)
             {
@@ -7421,10 +7420,10 @@ gckOS_WaitSignal(
             }
         }
 
-        __remove_wait_queue(&signal->obj.wait, &wait);
+        swait_finish_locked(&signal->obj.wait, &wait);
     }
 
-    spin_unlock_irq(&signal->obj.wait.lock);
+    raw_spin_unlock_irq(&signal->obj.wait.lock);
 
 OnError:
     /* Return status. */
@@ -8954,4 +8953,3 @@ OnError:
     gcmkFOOTER();
     return status;
 }
-
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 9+ messages in thread