diff options
| author | Sidath Senanayake <sidaths@google.com> | 2017-01-24 10:48:35 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-08-14 14:39:08 +0100 |
| commit | 44e8be9a3714ef2c7ce5a7b24d5428a9be72b17b (patch) | |
| tree | d283bab2da22d3e4523d29892cdfc74aff3c53aa /mali_kbase/platform | |
| parent | 5f133f2dc7f7893f62b63f6889112c985673c502 (diff) | |
| download | gpu-44e8be9a3714ef2c7ce5a7b24d5428a9be72b17b.tar.gz | |
Mali Bifrost DDK r4p0 KMD
Provenance:
e126eb313 (collaborate/EAC/b_r4p0)
BX304L01B-BU-00000-r4p0-01rel0
BX304L06A-BU-00000-r4p0-01rel0
BX304X07X-BU-00000-r4p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ibcec32b4736e66dab9ee6ba68704336354e9a1f3
Diffstat (limited to 'mali_kbase/platform')
| -rw-r--r-- | mali_kbase/platform/juno_soc/Kbuild | 7 | ||||
| -rw-r--r-- | mali_kbase/platform/juno_soc/mali_kbase_config_juno_soc.c | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mali_kbase/platform/juno_soc/Kbuild b/mali_kbase/platform/juno_soc/Kbuild index 5b6ef37..0449442 100644 --- a/mali_kbase/platform/juno_soc/Kbuild +++ b/mali_kbase/platform/juno_soc/Kbuild @@ -1,5 +1,5 @@ # -# (C) COPYRIGHT 2013-2014 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2013-2014, 2016 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 @@ -15,5 +15,8 @@ obj-y += mali_kbase_config_juno_soc.o - +ifeq (($CONFIG_MALI_MIDGARD),y) obj-m += juno_mali_opp.o +else ifeq ($(CONFIG_MALI_MIDGARD),m) +SRC += platform/juno_soc/mali_kbase_config_juno_soc.c +endif diff --git a/mali_kbase/platform/juno_soc/mali_kbase_config_juno_soc.c b/mali_kbase/platform/juno_soc/mali_kbase_config_juno_soc.c index c654818..d237a38 100644 --- a/mali_kbase/platform/juno_soc/mali_kbase_config_juno_soc.c +++ b/mali_kbase/platform/juno_soc/mali_kbase_config_juno_soc.c @@ -97,13 +97,7 @@ static int juno_protected_mode_reset(struct kbase_device *kbdev) JUNO_SMC_PROTECTED_RESET_FUNC, false, 0, 0, 0); - /* TODO: Remove this reset, it should be done by the firmware */ - kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_COMMAND), - GPU_COMMAND_HARD_RESET, NULL); - - while ((kbase_reg_read(kbdev, GPU_CONTROL_REG(GPU_IRQ_RAWSTAT), NULL) - & RESET_COMPLETED) != RESET_COMPLETED) - ; + /* The GPU should now be reset */ return ret; } |