diff options
Diffstat (limited to 'driver/gator_events_mali_4xx.c')
-rw-r--r-- | driver/gator_events_mali_4xx.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/driver/gator_events_mali_4xx.c b/driver/gator_events_mali_4xx.c index dd275f7..6719c1e 100644 --- a/driver/gator_events_mali_4xx.c +++ b/driver/gator_events_mali_4xx.c | |||
@@ -415,25 +415,12 @@ static void mali_counter_initialize(void) | |||
415 | int i; | 415 | int i; |
416 | int core_id; | 416 | int core_id; |
417 | 417 | ||
418 | mali_osk_fb_control_set_type *mali_set_fb_event; | ||
419 | mali_profiling_control_type *mali_control; | 418 | mali_profiling_control_type *mali_control; |
420 | 419 | ||
421 | init_counters(COUNTER_L2_0_C0, COUNTER_L2_0_C0 + (2 * n_l2_cores) - 1); | 420 | init_counters(COUNTER_L2_0_C0, COUNTER_L2_0_C0 + (2 * n_l2_cores) - 1); |
422 | init_counters(COUNTER_VP_0_C0, COUNTER_VP_0_C0 + (2 * n_vp_cores) - 1); | 421 | init_counters(COUNTER_VP_0_C0, COUNTER_VP_0_C0 + (2 * n_vp_cores) - 1); |
423 | init_counters(COUNTER_FP_0_C0, COUNTER_FP_0_C0 + (2 * n_fp_cores) - 1); | 422 | init_counters(COUNTER_FP_0_C0, COUNTER_FP_0_C0 + (2 * n_fp_cores) - 1); |
424 | 423 | ||
425 | mali_set_fb_event = symbol_get(_mali_osk_fb_control_set); | ||
426 | |||
427 | if (mali_set_fb_event) { | ||
428 | pr_debug("gator: mali online _mali_osk_fb_control_set symbol @ %p\n", mali_set_fb_event); | ||
429 | |||
430 | mali_set_fb_event(0, (counter_enabled[COUNTER_FILMSTRIP] ? 1 : 0)); | ||
431 | |||
432 | symbol_put(_mali_osk_fb_control_set); | ||
433 | } else { | ||
434 | printk("gator: mali online _mali_osk_fb_control_set symbol not found\n"); | ||
435 | } | ||
436 | |||
437 | /* Generic control interface for Mali DDK. */ | 424 | /* Generic control interface for Mali DDK. */ |
438 | mali_control = symbol_get(_mali_profiling_control); | 425 | mali_control = symbol_get(_mali_profiling_control); |
439 | if (mali_control) { | 426 | if (mali_control) { |
@@ -491,7 +478,6 @@ static void mali_counter_initialize(void) | |||
491 | static void mali_counter_deinitialize(void) | 478 | static void mali_counter_deinitialize(void) |
492 | { | 479 | { |
493 | mali_profiling_set_event_type *mali_set_hw_event; | 480 | mali_profiling_set_event_type *mali_set_hw_event; |
494 | mali_osk_fb_control_set_type *mali_set_fb_event; | ||
495 | mali_profiling_control_type *mali_control; | 481 | mali_profiling_control_type *mali_control; |
496 | 482 | ||
497 | mali_set_hw_event = symbol_get(_mali_profiling_set_event); | 483 | mali_set_hw_event = symbol_get(_mali_profiling_set_event); |
@@ -509,23 +495,11 @@ static void mali_counter_deinitialize(void) | |||
509 | printk("gator: mali offline _mali_profiling_set_event symbol not found\n"); | 495 | printk("gator: mali offline _mali_profiling_set_event symbol not found\n"); |
510 | } | 496 | } |
511 | 497 | ||
512 | mali_set_fb_event = symbol_get(_mali_osk_fb_control_set); | ||
513 | |||
514 | if (mali_set_fb_event) { | ||
515 | pr_debug("gator: mali offline _mali_osk_fb_control_set symbol @ %p\n", mali_set_fb_event); | ||
516 | |||
517 | mali_set_fb_event(0, 0); | ||
518 | |||
519 | symbol_put(_mali_osk_fb_control_set); | ||
520 | } else { | ||
521 | printk("gator: mali offline _mali_osk_fb_control_set symbol not found\n"); | ||
522 | } | ||
523 | |||
524 | /* Generic control interface for Mali DDK. */ | 498 | /* Generic control interface for Mali DDK. */ |
525 | mali_control = symbol_get(_mali_profiling_control); | 499 | mali_control = symbol_get(_mali_profiling_control); |
526 | 500 | ||
527 | if (mali_control) { | 501 | if (mali_control) { |
528 | pr_debug("gator: mali offline _mali_profiling_control symbol @ %p\n", mali_set_fb_event); | 502 | pr_debug("gator: mali offline _mali_profiling_control symbol @ %p\n", mali_control); |
529 | 503 | ||
530 | /* Reset the DDK state - disable counter collection */ | 504 | /* Reset the DDK state - disable counter collection */ |
531 | mali_control(SW_COUNTER_ENABLE, 0); | 505 | mali_control(SW_COUNTER_ENABLE, 0); |
@@ -747,5 +721,3 @@ int gator_events_mali_init(void) | |||
747 | 721 | ||
748 | return gator_events_install(&gator_events_mali_interface); | 722 | return gator_events_install(&gator_events_mali_interface); |
749 | } | 723 | } |
750 | |||
751 | gator_events_init(gator_events_mali_init); | ||