gpu: use _mali_osk_time_mstoticks instead of using raw jiffies [1/1]

PD #150542: use mali internal api to convert ms to jiffies.

Change-Id: Ic59c319cea9413160eacf937792957653519e0a5

diff --git a/mali/linux/mali_kernel_linux.c b/mali/linux/mali_kernel_linux.c
old mode 100755 (executable)
new mode 100644 (file)
index 70dab67..2c95146
--- a/mali/linux/mali_kernel_linux.c
+++ b/mali/linux/mali_kernel_linux.c
@@ -366,7 +366,7 @@ void mali_init_cpu_time_counters_on_all_cpus(int print_only)
        int jiffies_trigger;
        int jiffies_wait;
 
-       jiffies_wait = msecs_to_jiffies(20);
+       jiffies_wait = _mali_osk_time_mstoticks(20);
        jiffies_trigger = jiffies + jiffies_wait;
 
        for (i = 0 ; i < 8 ; i++) {

diff --git a/mali/linux/mali_osk_irq.c b/mali/linux/mali_osk_irq.c
old mode 100755 (executable)
new mode 100644 (file)
index 960ed81..9dc45de
--- a/mali/linux/mali_osk_irq.c
+++ b/mali/linux/mali_osk_irq.c
@@ -93,7 +93,7 @@ static _mali_osk_errcode_t test_interrupt(u32 irqnum,
        init_waitqueue_head(&data.wq);
 
        trigger_func(probe_data);
-       wait_event_timeout(data.wq, data.interrupt_received, 100);
+       wait_event_timeout(data.wq, data.interrupt_received, _mali_osk_time_mstoticks(1000));
 
        free_irq(irqnum, &data);
 

diff --git a/utgard/r5p1/linux/mali_kernel_linux.c b/utgard/r5p1/linux/mali_kernel_linux.c
old mode 100755 (executable)
new mode 100644 (file)
index b5dede6..81318dc
--- a/utgard/r5p1/linux/mali_kernel_linux.c
+++ b/utgard/r5p1/linux/mali_kernel_linux.c
@@ -335,7 +335,7 @@ void mali_init_cpu_time_counters_on_all_cpus(int print_only)
        int jiffies_trigger;
        int jiffies_wait;
 
-       jiffies_wait = msecs_to_jiffies(20);
+       jiffies_wait = _mali_osk_time_mstoticks(20);
        jiffies_trigger = jiffies + jiffies_wait;
 
        for (i = 0 ; i < 8 ; i++) {

diff --git a/utgard/r5p1/linux/mali_osk_irq.c b/utgard/r5p1/linux/mali_osk_irq.c
old mode 100755 (executable)
new mode 100644 (file)
index 6876b6d..fc2b7f5
--- a/utgard/r5p1/linux/mali_osk_irq.c
+++ b/utgard/r5p1/linux/mali_osk_irq.c
@@ -93,7 +93,7 @@ static _mali_osk_errcode_t test_interrupt(u32 irqnum,
        init_waitqueue_head(&data.wq);
 
        trigger_func(probe_data);
-       wait_event_timeout(data.wq, data.interrupt_received, 100);
+       wait_event_timeout(data.wq, data.interrupt_received, _mali_osk_time_mstoticks(1000));
 
        free_irq(irqnum, &data);
 

diff --git a/utgard/r6p1/linux/mali_kernel_linux.c b/utgard/r6p1/linux/mali_kernel_linux.c
old mode 100755 (executable)
new mode 100644 (file)
index 70dab67..2c95146
--- a/utgard/r6p1/linux/mali_kernel_linux.c
+++ b/utgard/r6p1/linux/mali_kernel_linux.c
@@ -366,7 +366,7 @@ void mali_init_cpu_time_counters_on_all_cpus(int print_only)
        int jiffies_trigger;
        int jiffies_wait;
 
-       jiffies_wait = msecs_to_jiffies(20);
+       jiffies_wait = _mali_osk_time_mstoticks(20);
        jiffies_trigger = jiffies + jiffies_wait;
 
        for (i = 0 ; i < 8 ; i++) {

diff --git a/utgard/r6p1/linux/mali_osk_irq.c b/utgard/r6p1/linux/mali_osk_irq.c
old mode 100755 (executable)
new mode 100644 (file)
index 960ed81..9dc45de
--- a/utgard/r6p1/linux/mali_osk_irq.c
+++ b/utgard/r6p1/linux/mali_osk_irq.c
@@ -93,7 +93,7 @@ static _mali_osk_errcode_t test_interrupt(u32 irqnum,
        init_waitqueue_head(&data.wq);
 
        trigger_func(probe_data);
-       wait_event_timeout(data.wq, data.interrupt_received, 100);
+       wait_event_timeout(data.wq, data.interrupt_received, _mali_osk_time_mstoticks(1000));
 
        free_irq(irqnum, &data);
 

diff --git a/utgard/r6p2/linux/mali_kernel_linux.c b/utgard/r6p2/linux/mali_kernel_linux.c
old mode 100755 (executable)
new mode 100644 (file)
index 70dab67..2c95146
--- a/utgard/r6p2/linux/mali_kernel_linux.c
+++ b/utgard/r6p2/linux/mali_kernel_linux.c
@@ -366,7 +366,7 @@ void mali_init_cpu_time_counters_on_all_cpus(int print_only)
        int jiffies_trigger;
        int jiffies_wait;
 
-       jiffies_wait = msecs_to_jiffies(20);
+       jiffies_wait = _mali_osk_time_mstoticks(20);
        jiffies_trigger = jiffies + jiffies_wait;
 
        for (i = 0 ; i < 8 ; i++) {

diff --git a/utgard/r6p2/linux/mali_osk_irq.c b/utgard/r6p2/linux/mali_osk_irq.c
old mode 100755 (executable)
new mode 100644 (file)
index 960ed81..9dc45de
--- a/utgard/r6p2/linux/mali_osk_irq.c
+++ b/utgard/r6p2/linux/mali_osk_irq.c
@@ -93,7 +93,7 @@ static _mali_osk_errcode_t test_interrupt(u32 irqnum,
        init_waitqueue_head(&data.wq);
 
        trigger_func(probe_data);
-       wait_event_timeout(data.wq, data.interrupt_received, 100);
+       wait_event_timeout(data.wq, data.interrupt_received, _mali_osk_time_mstoticks(1000));
 
        free_irq(irqnum, &data);
 

diff --git a/utgard/r7p0/linux/mali_osk_irq.c b/utgard/r7p0/linux/mali_osk_irq.c
index 267c047989fb0d3241faca655525764a0f05d0f2..7d33905d2ee0f84ebe1d14d8fb00da78c415d47e 100644 (file)
--- a/utgard/r7p0/linux/mali_osk_irq.c
+++ b/utgard/r7p0/linux/mali_osk_irq.c
@@ -93,7 +93,7 @@ static _mali_osk_errcode_t test_interrupt(u32 irqnum,
        init_waitqueue_head(&data.wq);
 
        trigger_func(probe_data);
-       wait_event_timeout(data.wq, data.interrupt_received, 100);
+       wait_event_timeout(data.wq, data.interrupt_received, _mali_osk_time_mstoticks(1000));
 
        free_irq(irqnum, &data);