From bd72f60d45e09e1f96df2b375cb455981af46e07 Mon Sep 17 00:00:00 2001 From: SeYeong Byeon Date: Fri, 22 Mar 2019 10:58:59 +0900 Subject: [PATCH] [RAMEN9610-13801] gpu: r16p0: allow choosing r16p0 for Android Q Adds MALI_BIFROST_R16P0_Q to menuconfig Change-Id: I25047939f572bd0ab898e42bec88b32ce5707976 Signed-off-by: SeYeong Byeon --- drivers/gpu/arm/Kbuild | 3 +++ drivers/gpu/arm/Kconfig | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild index b205ceaacdc8..2f2d32a57a8f 100644 --- a/drivers/gpu/arm/Kbuild +++ b/drivers/gpu/arm/Kbuild @@ -16,4 +16,7 @@ ifeq ($(CONFIG_MALI_DDK_VERSION),y) ifeq ($(CONFIG_MALI_BIFROST_R16P0),y) obj-y += b_r16p0/ endif + ifeq ($(CONFIG_MALI_BIFROST_R16P0_Q),y) + obj-y += b_r16p0_Q/ + endif endif diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig index 3b3e27d17b52..711c0370a20a 100644 --- a/drivers/gpu/arm/Kconfig +++ b/drivers/gpu/arm/Kconfig @@ -23,7 +23,8 @@ menuconfig MALI_DDK_VERSION choice prompt "version Configuration" depends on MALI_DDK_VERSION - default MALI_BIFROST_R16P0 + default MALI_BIFROST_R16P0_Q if SOC_EXYNOS9610_ANDROID_VERSION_Q + default MALI_BIFROST_R16P0 if !(SOC_EXYNOS9610_ANDROID_VERSION_Q) help Select the gpu support version. @@ -31,6 +32,10 @@ config MALI_BIFROST_R16P0 depends on MALI_DDK_VERSION bool "Bifrost r16p0 driver" +config MALI_BIFROST_R16P0_Q + depends on MALI_DDK_VERSION + bool "Bifrost r16p0 driver for Android Q" + config MALI_BIFROST_OLD depends on MALI_DDK_VERSION bool "Bifrost old driver" @@ -40,6 +45,10 @@ if MALI_BIFROST_R16P0 source "drivers/gpu/arm/b_r16p0/Kconfig" endif +if MALI_BIFROST_R16P0_Q +source "drivers/gpu/arm/b_r16p0_Q/Kconfig" +endif + if MALI_BIFROST_OLD source "drivers/gpu/arm/tHEx/Kconfig" endif -- 2.20.1