diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-08-31 19:15:13 +0000 |
|---|---|---|
| committer | Jörg Wagner <jorwag@google.com> | 2023-09-01 09:13:55 +0000 |
| commit | b6fd708b3a4da86a196a61592ea3585f1aca7313 (patch) | |
| tree | 1cbe3029a45bf9869c17a5b6954e5ae074b44ac8 /mali_kbase/tests | |
| parent | 46edf1b5965d872c5f8a09c6dc3dcbff58f78a92 (diff) | |
| parent | e61eb93296e9f940b32d4ad4b0c3a5557cbeaf17 (diff) | |
| download | gpu-b6fd708b3a4da86a196a61592ea3585f1aca7313.tar.gz | |
Merge r44p1-00dev3 from partner/upstream into android13-gs-pixel-5.10-udc-qpr1
Bug: 290882327
Change-Id: I90723cbaa3f294431087587fd8025f0688e51bf2
Diffstat (limited to 'mali_kbase/tests')
| -rw-r--r-- | mali_kbase/tests/Kbuild | 4 | ||||
| -rw-r--r-- | mali_kbase/tests/Kconfig | 3 | ||||
| -rw-r--r-- | mali_kbase/tests/Mconfig | 3 | ||||
| -rw-r--r-- | mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c | 7 |
4 files changed, 11 insertions, 6 deletions
diff --git a/mali_kbase/tests/Kbuild b/mali_kbase/tests/Kbuild index 38e4dd4..72ca70a 100644 --- a/mali_kbase/tests/Kbuild +++ b/mali_kbase/tests/Kbuild @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # -# (C) COPYRIGHT 2017, 2020-2022 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2017-2023 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 @@ -17,6 +17,7 @@ # http://www.gnu.org/licenses/gpl-2.0.html. # # +src:=$(if $(patsubst /%,,$(src)),$(srctree)/$(src),$(src)) ccflags-y += -I$(src)/include \ -I$(src) @@ -29,3 +30,4 @@ obj-$(CONFIG_MALI_KUTF_IRQ_TEST) += mali_kutf_irq_test/ obj-$(CONFIG_MALI_KUTF_CLK_RATE_TRACE) += mali_kutf_clk_rate_trace/kernel/ obj-$(CONFIG_MALI_KUTF_MGM_INTEGRATION) += mali_kutf_mgm_integration_test/ + diff --git a/mali_kbase/tests/Kconfig b/mali_kbase/tests/Kconfig index e6f0376..f100901 100644 --- a/mali_kbase/tests/Kconfig +++ b/mali_kbase/tests/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # -# (C) COPYRIGHT 2017, 2020-2022 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2017, 2020-2023 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 @@ -65,5 +65,6 @@ config MALI_KUTF_MGM_INTEGRATION_TEST - mali_kutf_mgm_integration_test.ko + comment "Enable MALI_DEBUG for KUTF modules support" depends on MALI_MIDGARD && !MALI_DEBUG && MALI_KUTF diff --git a/mali_kbase/tests/Mconfig b/mali_kbase/tests/Mconfig index d81c639..aa09274 100644 --- a/mali_kbase/tests/Mconfig +++ b/mali_kbase/tests/Mconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # -# (C) COPYRIGHT 2018-2022 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2018-2023 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 @@ -65,6 +65,7 @@ config MALI_KUTF_MGM_INTEGRATION_TEST - mali_kutf_mgm_integration_test.ko + # Enable MALI_DEBUG for KUTF modules support config UNIT_TEST_KERNEL_MODULES diff --git a/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c b/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c index a6f54b6..8b86fb0 100644 --- a/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c +++ b/mali_kbase/tests/mali_kutf_clk_rate_trace/kernel/mali_kutf_clk_rate_trace_test.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * - * (C) COPYRIGHT 2020-2022 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2020-2023 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 @@ -442,8 +442,9 @@ static const char *kutf_clk_trace_do_get_platform( #if defined(CONFIG_MALI_ARBITER_SUPPORT) && defined(CONFIG_OF) struct kutf_clk_rate_trace_fixture_data *data = context->fixture; - arbiter_if_node = - of_get_property(data->kbdev->dev->of_node, "arbiter_if", NULL); + arbiter_if_node = of_get_property(data->kbdev->dev->of_node, "arbiter-if", NULL); + if (!arbiter_if_node) + arbiter_if_node = of_get_property(data->kbdev->dev->of_node, "arbiter_if", NULL); #endif if (arbiter_if_node) { power_node = of_find_compatible_node(NULL, NULL, |