MALI: utgard: upgrade DDK to r6p1-01rel0

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / mali400 / mali / common / mali_gp.c

diff --git a/drivers/gpu/arm/mali400/mali/common/mali_gp.c b/drivers/gpu/arm/mali400/mali/common/mali_gp.c
index a690781837e98f991fc2509ceef2185b0f40d7e4..a918552162a80384e5ccdc86bc3a5a367a56bb87 100755 (executable)
--- a/drivers/gpu/arm/mali400/mali/common/mali_gp.c
+++ b/drivers/gpu/arm/mali400/mali/common/mali_gp.c
@@ -12,6 +12,7 @@
 #include "mali_hw_core.h"
 #include "mali_group.h"
 #include "mali_osk.h"
+#include "mali_osk_mali.h"
 #include "regs/mali_gp_regs.h"
 #include "mali_kernel_common.h"
 #include "mali_kernel_core.h"
@@ -199,6 +200,11 @@ void mali_gp_job_start(struct mali_gp_core *core, struct mali_gp_job *job)
        u32 counter_src0 = mali_gp_job_get_perf_counter_src0(job);
        u32 counter_src1 = mali_gp_job_get_perf_counter_src1(job);
 
+       /* Disable gpu secure mode. */
+       if (MALI_TRUE == _mali_osk_gpu_secure_mode_is_enabled()) {
+               _mali_osk_gpu_secure_mode_disable();
+       }
+
        MALI_DEBUG_ASSERT_POINTER(core);
 
        if (mali_gp_job_has_vs_job(job)) {