MALI: Hikey970 GPU Dirver Porting

arch/arm64/boot/dts/hisilicon/kirin970-hikey970.dts

@@ -13,6 +13,7 @@
 #include <dt-bindings/input/input.h>
 #include "kirin970_spmi.dtsi"
 #include "hisi_6421v600_pmic_spmi.dtsi"
+#include "kirin970-gpu.dtsi"
 
 #include "kirin970-ion.dtsi"
 #include "kirin970-coresight.dtsi"

arch/arm64/configs/hikey960_defconfig

@@ -457,6 +457,7 @@ CONFIG_HISI_IOMMU_LPAE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
 CONFIG_HISI_DDR_DEVFREQ=y
 CONFIG_EXTCON=y
+CONFIG_MALI_PLATFORM_HIKEY960=y
 CONFIG_MALI_MIDGARD=y
 CONFIG_MALI_EXPERT=y
 CONFIG_MALI_PLATFORM_FAKE=y

arch/arm64/configs/hikey970_defconfig

@@ -704,10 +704,10 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_CRC32_ARM64=y
 CONFIG_HI_VCODEC_VENC=y
 CONFIG_HI_VCODEC_VDEC=y
-# CONFIG_MALI_PLATFORM_HIKEY970 is not set
-# CONFIG_MALI_MIDGARD is not set
-# CONFIG_MALI_EXPERT is not set
-# CONFIG_MALI_DEVFREQ is not set
+CONFIG_MALI_PLATFORM_HIKEY970=y
+CONFIG_MALI_MIDGARD=y
+CONFIG_MALI_EXPERT=y
+CONFIG_MALI_DEVFREQ=y
 # CONFIG_HISILICON_PLATFORM is not set
 # CONFIG_HISILICON_PLATFORM_MAILBOX is not set
 # CONFIG_HISI_MAILBOX is not set

arch/arm64/configs/hikey_defconfig

@@ -346,6 +346,7 @@ CONFIG_MEDIA_TUNER_QM1D1C0042=y
 CONFIG_DVB_AU8522_V4L=y
 CONFIG_DVB_TUNER_DIB0070=y
 CONFIG_DVB_TUNER_DIB0090=y
+CONFIG_MALI_PLATFORM_HIKEY=y
 CONFIG_MALI400=y
 CONFIG_MALI450=y
 CONFIG_MALI400_DEBUG=y

drivers/Kconfig

@@ -176,7 +176,7 @@ source "drivers/ipack/Kconfig"
 
 source "drivers/reset/Kconfig"
 
-source "drivers/gpu/arm_gpu/Kconfig"
+source "drivers/gpu/arm/Kconfig"
 
 source "drivers/fmc/Kconfig"
 

drivers/gpu/Makefile

@@ -2,6 +2,5 @@
 # taken to initialize them in the correct order. Link order is the only way
 # to ensure this currently.
 obj-$(CONFIG_TEGRA_HOST1X)	+= host1x/
-obj-y			+= drm/ vga/ arm/
-obj-y			+= arm_gpu/
+obj-y				+= drm/ vga/ arm/
 obj-$(CONFIG_IMX_IPUV3_CORE)	+= ipu-v3/

drivers/gpu/arm/Kconfig

@@ -1 +1,27 @@
+config MALI_PLATFORM_HIKEY
+        tristate "Hikey Mali configs"
+        default n
+
+config MALI_PLATFORM_HIKEY960
+        tristate "Hikey960 Mali configs"
+        default n
+
+config MALI_PLATFORM_HIKEY970
+        tristate "Hikey970 Mali configs"
+        default n
+
+menu "ARM GPU Configuration"
+
+if MALI_PLATFORM_HIKEY
 source "drivers/gpu/arm/utgard/Kconfig"
+endif
+
+if MALI_PLATFORM_HIKEY960
+source "drivers/gpu/arm/bifrost-hikey960/Kconfig"
+endif
+
+if MALI_PLATFORM_HIKEY970
+source "drivers/gpu/arm/bifrost-hikey970/Kconfig"
+endif
+
+endmenu

drivers/gpu/arm/Makefile

@@ -1 +1,3 @@
-obj-y += utgard/
+obj-$(CONFIG_MALI_PLATFORM_HIKEY) 	+= utgard/
+obj-$(CONFIG_MALI_PLATFORM_HIKEY960) 	+= bifrost-hikey960/
+obj-$(CONFIG_MALI_PLATFORM_HIKEY970)	+= bifrost-hikey970/

drivers/gpu/arm/bifrost-hikey960/Kconfig

@@ -258,6 +258,6 @@ config MALI_PWRSOFT_765
 	  not merged in mainline kernel yet. So this define helps to guard those
 	  parts of the code.
 
-source "drivers/gpu/arm_gpu/platform/Kconfig"
+source "drivers/gpu/arm/bifrost-hikey960/platform/Kconfig"
 #source "drivers/gpu/arm/midgard/platform/Kconfig"
 #source "drivers/gpu/arm/midgard/tests/Kconfig"