From: Kasin Lee Date: Wed, 13 Aug 2014 16:21:38 +0000 (+0800) Subject: PD #92501: fix m6 error X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=883bac3c94e3356f4a0c9a0c556ab3e22b779b3a;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_mali-driver.git PD #92501: fix m6 error Change-Id: I50114212a30de30fdfe6cf8d1980af0ac15c435b --- diff --git a/mali/common/mali_group.c b/mali/common/mali_group.c index 2796c12..8c35a2d 100755 --- a/mali/common/mali_group.c +++ b/mali/common/mali_group.c @@ -1311,6 +1311,7 @@ static void mali_group_mmu_page_fault_and_unlock(struct mali_group *group) } #if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6 +#include #define INT_MALI_PP2_MMU ( 6+32) struct _mali_osk_irq_t_struct; u32 get_irqnum(struct _mali_osk_irq_t_struct* irq); diff --git a/mali/platform/meson_m400/mali_fix.h b/mali/platform/meson_m400/mali_fix.h old mode 100644 new mode 100755 index 431c59f..3c29161 --- a/mali/platform/meson_m400/mali_fix.h +++ b/mali/platform/meson_m400/mali_fix.h @@ -11,5 +11,4 @@ extern void malifix_exit(void); extern void malifix_set_mmu_int_process_state(int, int); extern int malifix_get_mmu_int_process_state(int); extern int mali_meson_is_revb(void); - #endif /* MALI_FIX_H */ diff --git a/mali/platform/mpgpu.c b/mali/platform/mpgpu.c index fe0f637..9983603 100755 --- a/mali/platform/mpgpu.c +++ b/mali/platform/mpgpu.c @@ -309,7 +309,7 @@ static ssize_t current_pp_write(struct class *class, static struct class_attribute mali_class_attrs[] = { -#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8 +#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON6TVD __ATTR(domain_stat, 0644, domain_stat_read, NULL), __ATTR(mpgpucmd, 0644, NULL, mpgpu_write), __ATTR(scale_mode, 0644, scale_mode_read, scale_mode_write),