| From 5203e1d46b0816e7aba34d5a6d85e5b72a893960 Mon Sep 17 00:00:00 2001 |
| From: Fei Shao <fshao@chromium.org> |
| Date: Wed, 1 Feb 2023 18:57:15 +0800 |
| Subject: [PATCH] CHROMIUM: config: mediatek: Enable Mali configs |
| |
| Enable the configs for Mali kbase driver. |
| |
| BUG=b:255285810,b:264486620,b:255485469 |
| TEST=./chromeos/scripts/kernelconfig olddefconfig |
| TEST=uprev kbase driver and deploy 6.1 kernel to Geralt |
| |
| Change-Id: I9547065fb988297d7a1968234693c44046a51ae6 |
| Signed-off-by: Fei Shao <fshao@chromium.org> |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4218176 |
| Reviewed-by: Wei-Shun Chang <weishunc@chromium.org> |
| --- |
| .../arm64/chromiumos-mediatek.flavour.config | 6 ++++++ |
| drivers/gpu/Makefile | 2 +- |
| drivers/gpu/arm/Kbuild | 21 +++ |
| drivers/gpu/arm/Kconfig | 23 ++++ |
| drivers/video/Kconfig | 2 + |
| 5 files changed, 168 insertions(+), 1 deletion(-) |
| create mode 100644 chromeos/config/chromeos/arm64/chromiumos-mediatek.flavour.config |
| create mode 100644 drivers/gpu/arm/Kbuild |
| create mode 100644 drivers/gpu/arm/Kconfig |
| |
| diff --git a/chromeos/config/chromeos/arm64/chromiumos-mediatek.flavour.config b/chromeos/config/chromeos/arm64/chromiumos-mediatek.flavour.config |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..fcc37667f4cb6036270d34050559ba0011221020 |
| --- /dev/null |
| +++ b/chromeos/config/chromeos/arm64/chromiumos-mediatek.flavour.config |
| @@ -0,0 +1,6 @@ |
| +# |
| +# Config options generated by splitconfig |
| +# |
| +CONFIG_MALI=y |
| +CONFIG_MALI_EXPERT=y |
| +CONFIG_MALI_PLATFORM_NAME="mediatek" |
| diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile |
| index 8997f0096545e22363bb3b63ead71f0b145597dc..7a99b1e05f732e190872982ace499853f7d34ede 100644 |
| --- a/drivers/gpu/Makefile |
| +++ b/drivers/gpu/Makefile |
| @@ -2,6 +2,6 @@ |
| # drm/tegra depends on host1x, so if both drivers are built-in care must be |
| # taken to initialize them in the correct order. Link order is the only way |
| # to ensure this currently. |
| -obj-y += host1x/ drm/ vga/ |
| +obj-y += host1x/ drm/ vga/ arm/ |
| obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ |
| obj-$(CONFIG_TRACE_GPU_MEM) += trace/ |
| diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..4d29d3b561c893cda6d00d3a1ed5e1cfe4d25086 |
| --- /dev/null |
| +++ b/drivers/gpu/arm/Kbuild |
| @@ -0,0 +1,21 @@ |
| +# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note |
| +# |
| +# (C) COPYRIGHT 2012, 2020-2021 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 |
| +# Foundation, and any use by you of this program is subject to the terms |
| +# of such GNU license. |
| +# |
| +# This program is distributed in the hope that it will be useful, |
| +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| +# GNU General Public License for more details. |
| +# |
| +# You should have received a copy of the GNU General Public License |
| +# along with this program; if not, you can access it online at |
| +# http://www.gnu.org/licenses/gpl-2.0.html. |
| +# |
| +# |
| + |
| +obj-$(CONFIG_MALI) += mali/ |
| diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..51a99c4fd5c9f5f17ece30fe8305f5f08bdc2804 |
| --- /dev/null |
| +++ b/drivers/gpu/arm/Kconfig |
| @@ -0,0 +1,23 @@ |
| +# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note |
| +# |
| +# (C) COPYRIGHT 2012, 2021 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 |
| +# Foundation, and any use by you of this program is subject to the terms |
| +# of such GNU license. |
| +# |
| +# This program is distributed in the hope that it will be useful, |
| +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| +# GNU General Public License for more details. |
| +# |
| +# You should have received a copy of the GNU General Public License |
| +# along with this program; if not, you can access it online at |
| +# http://www.gnu.org/licenses/gpl-2.0.html. |
| +# |
| +# |
| + |
| +menu "ARM GPU Configuration" |
| +source "drivers/gpu/arm/mali/Kconfig" |
| +endmenu |
| diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig |
| index 6d2fde6c5d11a18ab02c5d6893020c17a10f309d..d405a7bd1504cd71fa471f8934417c864c2985be 100644 |
| --- a/drivers/video/Kconfig |
| +++ b/drivers/video/Kconfig |
| @@ -29,6 +29,8 @@ source "drivers/gpu/ipu-v3/Kconfig" |
| |
| source "drivers/gpu/drm/Kconfig" |
| |
| +source "drivers/gpu/arm/Kconfig" |
| + |
| menu "Frame buffer Devices" |
| source "drivers/video/fbdev/Kconfig" |
| endmenu |
| -- |
| 2.38.3 |
| |
