hc
2023-11-07 f45e756958099c35d6afb746df1d40a1c6302cfc
kernel/drivers/gpu/arm/mali400/mali/common/mali_control_timer.c
....@@ -19,7 +19,7 @@
1919 static u64 period_start_time = 0;
2020
2121 /** .KP : mali_control_timer */
22
-static _mali_osk_timer_t *mali_control_timer = NULL;
22
+static _mali_osk_timer_t mali_control_timer;
2323 static mali_bool timer_running = MALI_FALSE;
2424
2525 /**
....@@ -30,12 +30,12 @@
3030
3131 void mali_control_timer_add(u32 timeout)/* 'timeout' : 以 ms 为单位. */
3232 {
33
- _mali_osk_timer_add(mali_control_timer, _mali_osk_time_mstoticks(timeout));
33
+ _mali_osk_timer_add(&mali_control_timer, _mali_osk_time_mstoticks(timeout));
3434 }
3535
3636 void mali_control_timer_mod(u32 timeout_in_ms)
3737 {
38
- _mali_osk_timer_mod(mali_control_timer, _mali_osk_time_mstoticks(timeout_in_ms));
38
+ _mali_osk_timer_mod(&mali_control_timer, _mali_osk_time_mstoticks(timeout_in_ms));
3939 }
4040
4141 static void mali_control_timer_callback(void *arg)
....@@ -76,23 +76,15 @@
7676 }
7777 }
7878
79
- mali_control_timer = _mali_osk_timer_init(mali_control_timer_callback);
80
- if (NULL == mali_control_timer) {
81
- return _MALI_OSK_ERR_FAULT;
82
- }
83
- _mali_osk_timer_setcallback(mali_control_timer, mali_control_timer_callback, NULL);
79
+ _mali_osk_timer_init(&mali_control_timer, mali_control_timer_callback);
8480
8581 return _MALI_OSK_ERR_OK;
8682 }
8783
8884 void mali_control_timer_term(void)
8985 {
90
- if (NULL != mali_control_timer) {
91
- _mali_osk_timer_del(mali_control_timer);
92
- timer_running = MALI_FALSE;
93
- _mali_osk_timer_term(mali_control_timer);
94
- mali_control_timer = NULL;
95
- }
86
+ _mali_osk_timer_del(&mali_control_timer);
87
+ timer_running = MALI_FALSE;
9688 }
9789
9890 mali_bool mali_control_timer_resume(u64 time_now)
....@@ -130,7 +122,7 @@
130122 mali_utilization_data_unlock();
131123
132124 if (suspend == MALI_TRUE) {
133
- _mali_osk_timer_del(mali_control_timer);
125
+ _mali_osk_timer_del(&mali_control_timer);
134126 mali_utilization_reset();
135127 }
136128 } else {