diff options
| author | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-15 16:11:46 +0800 |
|---|---|---|
| committer | Jacob Chen <jacob2.chen@rock-chips.com> | 2016-10-15 16:11:46 +0800 |
| commit | 028bc40a6d227cb553236588c43f35ad7ae2af97 (patch) | |
| tree | 662944c4a76cecb58cb63da17d5ed9aac1b39914 /drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c | |
| parent | f27d1ca8e35893191bb344bb461d9f5f20be5ae7 (diff) | |
HEADER: MALI: rockchip: upgrade midgard DDK to r9p0-05rel0release-20161015
Change-Id: Ie46489734268edac2db7508ed6976fc8b72c2f06
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c')
| -rw-r--r-- | drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c index d578fd78e825..72a98d0f7952 100644 --- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c +++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_gpu.c @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2014-2016 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2014-2015 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -20,6 +20,7 @@ * Register-based HW access backend APIs */ #include <mali_kbase.h> +#include <mali_kbase_hwaccess_jm.h> #include <mali_kbase_hwaccess_backend.h> #include <backend/gpu/mali_kbase_irq_internal.h> #include <backend/gpu/mali_kbase_jm_internal.h> @@ -80,6 +81,7 @@ int kbase_backend_late_init(struct kbase_device *kbdev) if (err) goto fail_timer; +/* Currently disabled on the prototype */ #ifdef CONFIG_MALI_DEBUG #ifndef CONFIG_MALI_NO_MALI if (kbasep_common_test_interrupt_handlers(kbdev) != 0) { @@ -99,13 +101,12 @@ int kbase_backend_late_init(struct kbase_device *kbdev) return 0; fail_job_slot: - +/* Currently disabled on the prototype */ #ifdef CONFIG_MALI_DEBUG #ifndef CONFIG_MALI_NO_MALI fail_interrupt_test: #endif /* !CONFIG_MALI_NO_MALI */ #endif /* CONFIG_MALI_DEBUG */ - kbase_backend_timer_term(kbdev); fail_timer: kbase_hwaccess_pm_halt(kbdev); |