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/platform | |
| 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/platform')
| -rw-r--r-- | mali_kbase/platform/Kconfig | 4 | ||||
| -rw-r--r-- | mali_kbase/platform/meson/mali_kbase_config_platform.h | 8 | ||||
| -rw-r--r-- | mali_kbase/platform/pixel/pixel_gpu_sscd.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mali_kbase/platform/Kconfig b/mali_kbase/platform/Kconfig index de4203c..b190e26 100644 --- a/mali_kbase/platform/Kconfig +++ b/mali_kbase/platform/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # -# (C) COPYRIGHT 2012-2013, 2017, 2021 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2012-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 @@ -20,7 +20,7 @@ # Add your platform specific Kconfig file here # -# "drivers/gpu/arm/midgard/platform/xxx/Kconfig" +# "$(MALI_KCONFIG_EXT_PREFIX)drivers/gpu/arm/midgard/platform/xxx/Kconfig" # # Where xxx is the platform name is the name set in MALI_PLATFORM_NAME # diff --git a/mali_kbase/platform/meson/mali_kbase_config_platform.h b/mali_kbase/platform/meson/mali_kbase_config_platform.h index 06279e2..866a7de 100644 --- a/mali_kbase/platform/meson/mali_kbase_config_platform.h +++ b/mali_kbase/platform/meson/mali_kbase_config_platform.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * - * (C) COPYRIGHT 2014-2017, 2019-2021 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2014-2017, 2019-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 @@ -20,7 +20,7 @@ */ /** - * Power management configuration + * POWER_MANAGEMENT_CALLBACKS - Power management configuration * * Attached value: pointer to @ref kbase_pm_callback_conf * Default value: See @ref kbase_pm_callback_conf @@ -28,7 +28,7 @@ #define POWER_MANAGEMENT_CALLBACKS (&pm_callbacks) /** - * Platform specific configuration functions + * PLATFORM_FUNCS - Platform specific configuration functions * * Attached value: pointer to @ref kbase_platform_funcs_conf * Default value: See @ref kbase_platform_funcs_conf @@ -38,7 +38,7 @@ extern struct kbase_pm_callback_conf pm_callbacks; /** - * Autosuspend delay + * AUTO_SUSPEND_DELAY - Autosuspend delay * * The delay time (in milliseconds) to be used for autosuspend */ diff --git a/mali_kbase/platform/pixel/pixel_gpu_sscd.c b/mali_kbase/platform/pixel/pixel_gpu_sscd.c index c65e6ce..75f3c2a 100644 --- a/mali_kbase/platform/pixel/pixel_gpu_sscd.c +++ b/mali_kbase/platform/pixel/pixel_gpu_sscd.c @@ -119,7 +119,7 @@ static void get_fw_trace(struct kbase_device *kbdev, struct sscd_segment *seg) .version = 1, }; - tb = kbase_csf_firmware_get_trace_buffer(kbdev, FIRMWARE_LOG_BUF_NAME); + tb = kbase_csf_firmware_get_trace_buffer(kbdev, KBASE_CSFFW_LOG_BUF_NAME); if (tb == NULL) { dev_err(kbdev->dev, "pixel: failed to open firmware trace buffer"); |