Gator with MALI-6xx

Hi,

I was trying to follow the instructions (Using DS-5 Streamline with Mali on Samsung Galaxy Note 3 & 10.1) to build gator with Mali-6xx support for Samsung Note 10.1 (2014) with Android 4.4.2 and kernel 3.4.39. Most of the instruction went smoothly till the part of building gator drivers.

GATOR_WITH_MALI_SUPPORT=MALI_T6xx make -C /home/kbzowski/sources/android/kernel-src M=`pwd` modules

Building gator module failed with an error:

make: Entering directory `/home/kbzowski/sources/android/kernel-src'
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_main.o
:0:0: error: "MALI_SUPPORT" redefined [-Werror]
:0:0: note: this is the location of the previous definition
In file included from /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_main.c:257:0:
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_marshaling.c: In function 'marshal_summary':
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_marshaling.c:54:6: error: "MALI_T6xx" is not defined [-Werror=undef]
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_marshaling.c:56:8: error: "MALI_T6xx" is not defined [-Werror=undef]
In file included from /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_main.c:263:0:
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_trace_gpu.c: At top level:
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_trace_gpu.c:22:36: fatal error: linux/mali_linux_trace.h: No such file or directory
cc1: all warnings being treated as errors

compilation terminated.
make[1]: *** [/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_main.o] Error 1
make: *** [_module_/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver] Error 2
make: Leaving directory `/home/kbzowski/sources/android/kernel-src'

I checked gator_marshaling.c and it looks like I should use GATOR_WITH_MALI_SUPPORT=MALI_MIDGARD instead.

but

GATOR_WITH_MALI_SUPPORT=MALI_MIDGARD make -C /home/kbzowski/sources/android/kernel-src M=`pwd` modules

Finished with an error also:

make: Entering directory `/home/kbzowski/sources/android/kernel-src'
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_main.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_block.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_irq.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_meminfo.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mmapped.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_net.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_perf_pmu.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_sched.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mali_midgard.o
  CC [M]  /home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mali_midgard_hw.o
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mali_midgard_hw.c: In function 'read_counter':
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mali_midgard_hw.c:769:64: error: 'vithar_blocks' undeclared (first use in this function)
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mali_midgard_hw.c:769:64: note: each undeclared identifier is reported only once for each function it appears in
/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mali_midgard_hw.c:776:3: error: 'value' undeclared (first use in this function)
make[1]: *** [/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver/gator_events_mali_midgard_hw.o] Error 1
make: *** [_module_/home/kbzowski/sources/android/DS-5/arm/gator/driver-src/gator-driver] Error 2
make: Leaving directory `/home/kbzowski/sources/android/kernel-src'

Kind Regards,

Krzysztof Bzowski