Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d65f7e95 authored by bonuzzz's avatar bonuzzz
Browse files

mali r15 (reverted from commit 674915d7)

parent 674915d7

arch/arm/boot/dts/exynos5433.dtsi

100755 → 100644
+0 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,6 @@ 
		compatible = "arm,mali";

		reg = <0x14AC0000 0x5000>;

		interrupts = <0 282 0>, <0 283 0>, <0 281 0>;

		interrupt-names = "JOB", "MMU", "GPU";

		clocks = <&clock 1>, <&clock 10>, <&clock 1000>, <&clock 3120>, <&clock 4132>, <&clock 5072>;

		clock-names = "fin_pll", "fout_g3d_pll", "aclk_g3d", "mout_g3d_pll", "dout_aclk_g3d", "mout_aclk_g3d";

		samsung,power-domain = <&pd_g3d>;

arch/arm/configs/lineage_exynos5433_gts28wifi_defconfig

+14 −27
Original line number Diff line number Diff line
@@ -2725,48 +2725,36 @@ CONFIG_ION=y 
CONFIG_ION_EXYNOS=y

CONFIG_ION_EXYNOS_STAT_LOG=y

CONFIG_ION_EXYNOS_OF=y

CONFIG_DDK_VERSION_OS="n"



#

# ARM GPU Configuration

#

CONFIG_MALI_T7XX=y

# CONFIG_MALI_R5P0 is not set

# CONFIG_MALI_R7P0 is not set

# CONFIG_MALI_R12P0 is not set

CONFIG_MALI_R15P0=y

# CONFIG_MALI_GATOR_SUPPORT is not set

CONFIG_MALI_DVFS=y

CONFIG_MALI_RT_PM=y

# CONFIG_MALI_MIDGARD is not set

CONFIG_MALI_EXYNOS_TRACE=y

CONFIG_MALI_DEBUG_SYS=y

CONFIG_MALI_EXPERT=y

# CONFIG_MALI_DEVFREQ is not set

# CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set

# CONFIG_MALI_PLATFORM_FAKE is not set

CONFIG_MALI_PLATFORM_THIRDPARTY=y

CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="exynos"

CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="5433"

# CONFIG_MALI_DEBUG is not set

# CONFIG_MALI_NO_MALI is not set

# CONFIG_MALI_TRACE_TIMELINE is not set

# CONFIG_MALI_SYSTEM_TRACE is not set

# CONFIG_MALI_MIDGARD_WK04 is not set

CONFIG_DDK_VERSION_OS="n"

CONFIG_MALI_T7XX=y

# CONFIG_MALI_R5P0 is not set

# CONFIG_MALI_R7P0 is not set

CONFIG_MALI_R12P0=y

CONFIG_MALI_DVFS=y

CONFIG_MALI_RT_PM=y

CONFIG_MALI_DEBUG_SYS=y

# CONFIG_MALI_DEVFREQ is not set

CONFIG_MALI_SYSTRACE_SUPPORT=y

# CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set

CONFIG_MALI_SEC_HWCNT=y

CONFIG_MALI_SEC_LEGACY_SUPPORT=y

CONFIG_EXYNOS_SOC_NAME="5433"

# CONFIG_MALI_DMA_FENCE is not set

# CONFIG_MALI_PRFCNT_SET_SECONDARY is not set

CONFIG_MALI_MIDGARD=y

# CONFIG_MALI_MIDGARD_DVFS is not set

# CONFIG_MALI_CORESTACK is not set

# CONFIG_MALI_FENCE_DEBUG is not set

# CONFIG_MALI_GPU_MMU_AARCH64 is not set

CONFIG_MALI_SEC_CL_BOOST=y

CONFIG_MALI_SEC_UTILIZATION=y

CONFIG_MALI_PM_QOS=y

# CONFIG_MALI_BTS_OPTIMIZATION is not set

# CONFIG_MALI_EXYNOS_SECURE_RENDERING is not set

# CONFIG_STATE is not set

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

CONFIG_FB=y

# CONFIG_FIRMWARE_EDID is not set
@@ -4458,7 +4446,6 @@ CONFIG_TRACER_MAX_TRACE=y 
CONFIG_TRACE_CLOCK=y

CONFIG_RING_BUFFER=y

CONFIG_EVENT_TRACING=y

CONFIG_GPU_TRACEPOINTS=y						

CONFIG_CONTEXT_SWITCH_TRACER=y

CONFIG_TRACING=y

CONFIG_GENERIC_TRACER=y

drivers/gpu/arm/Kbuild

100755 → 100644
+7 −22
Original line number Diff line number Diff line
@@ -9,28 +9,16 @@ 
#

#



#

# T6XX configs

# (5430)

#

obj-$(CONFIG_MALI_MIDGARD_WK04) += midgard_wk04/



ifeq ($(CONFIG_MALI_T6XX),y)

obj-$(CONFIG_MALI_T6XX) += t6xx/

ifeq ($(CONFIG_MALI_T6XX_R7P0),y)

		obj-y += t6xx/r7p0/

	endif

	ifeq ($(CONFIG_MALI_T6XX_R12P0),y)

		obj-y += t6xx/r12p0/

	endif

	ifeq ($(CONFIG_MALI_T6XX_R15P0),y)

		obj-y += t6xx/r15p0/

	ifeq ($(CONFIG_MALI_R7P0_T6XX),y)

		obj-y += t6xx/

	endif

endif



#

# T7XX configs

# (5433)

#

obj-$(CONFIG_MALI_MIDGARD) += midgard/

obj-$(CONFIG_MALI_MIDGARD_WK04) += midgard_wk04/

# obj-$(CONFIG_MALI400) += mali400/ # comment out for kernel build error fix

ifeq ($(CONFIG_MALI_T7XX),y)

	ifeq ($(CONFIG_MALI_R5P0),y)

		obj-y += t7xx/r5p0/
@@ -41,7 +29,4 @@ ifeq ($(CONFIG_MALI_T7XX),y) 
	ifeq ($(CONFIG_MALI_R12P0),y)

		obj-y += t7xx/r12p0/

	endif

	ifeq ($(CONFIG_MALI_R15P0),y)

		obj-y += t7xx/r15p0/

	endif

endif

drivers/gpu/arm/Kconfig

100755 → 100644
+10 −19
Original line number Diff line number Diff line
@@ -8,25 +8,16 @@ 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

#

#

menu "ARM GPU Configuration"



config DDK_VERSION_OS

	string "version"

	default ANDROID_MAJOR_VERSION

	help

		Android OS major version

source "drivers/gpu/arm/midgard/Kconfig"

source "drivers/gpu/arm/midgard_wk04/Kconfig"



menu "ARM GPU Configuration"

if (SOC_EXYNOS5433)

source "drivers/gpu/arm/t7xx/Kconfig"

endif



	if (SOC_EXYNOS5430)

		if DDK_VERSION_OS = "l"

			source "drivers/gpu/arm/midgard_wk04/Kconfig"

		endif

		if DDK_VERSION_OS = "m" || DDK_VERSION_OS = "n"

if (!SOC_EXYNOS5433) # other SOCs; 5430 5422 5420

source "drivers/gpu/arm/t6xx/kbase/Kconfig"

source "drivers/gpu/arm/t6xx/Kconfig"

endif

	endif

endmenu

drivers/gpu/arm/t7xx/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ choice 
	prompt "version Configuration"

	depends on MALI_T7XX

	default MALI_R7P0 if  DDK_VERSION_OS = "m"

	default MALI_R15P0 if DDK_VERSION_OS = "n"

	default MALI_R12P0 if DDK_VERSION_OS = "n"

	help

	  Select the gpu support version.
@@ -42,9 +42,9 @@ config MALI_R7P0 
	depends on MALI_T7XX

	bool "r7p0 driver"



config MALI_R15P0

config MALI_R12P0

	depends on MALI_T7XX

	bool "r15p0 driver"

	bool "r12p0 driver"



endchoice
@@ -56,7 +56,7 @@ if MALI_R7P0 
source "drivers/gpu/arm/t7xx/r7p0/Kconfig"

endif



if MALI_R15P0

source "drivers/gpu/arm/t7xx/r15p0/Kconfig"

if MALI_R12P0

source "drivers/gpu/arm/t7xx/r12p0/Kconfig"

endif