From 2dda2200193106a50ad29136c571fd681e588980 Mon Sep 17 00:00:00 2001
From: Xianzhong <xianzhong.li@nxp.com>
Date: Fri, 26 May 2017 15:50:07 +0800
Subject: [PATCH] MGS-2947 enable gpu subsystem for imx8qm and imx8qxp

enable gpu subsystem device config for imx8qm and imx8qxp,
enable builtin GPU module in kernel image by default

Signed-off-by: Xianzhong <b07117@freescale.com>
---
 .../boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts    | 12 ++++++++++++
 .../boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2.dts   |  8 ++++++++
 drivers/mxc/gpu-viv/Kconfig                          |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts
index afc532031e58..86a65e1d540f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts
@@ -485,3 +485,15 @@
 	>;
 	clocks = <&clk IMX8QM_A72_DIV>;
 };
+
+&gpu_3d0 {
+	status = "okay";
+};
+
+&gpu_3d1 {
+	status = "okay";
+};
+
+&imx8_gpu_ss {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2.dts
index 08a467baf3d4..e644ab1a378f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-lpddr4-arm2.dts
@@ -252,3 +252,11 @@
 	vmmc-supply = <&reg_sd1_vmmc>;
 	status = "okay";
 };
+
+&gpu_3d0 {
+	status = "okay";
+};
+
+&imx8_gpu_ss {
+	status = "okay";
+};
diff --git a/drivers/mxc/gpu-viv/Kconfig b/drivers/mxc/gpu-viv/Kconfig
index ae0c127911e7..d1fcd69b2845 100644
--- a/drivers/mxc/gpu-viv/Kconfig
+++ b/drivers/mxc/gpu-viv/Kconfig
@@ -3,6 +3,8 @@ menu "MXC Vivante GPU support"
 
 config MXC_GPU_VIV
 	tristate "MXC Vivante GPU support"
+	default y
+
 	---help---
          Say Y to get the GPU driver support.
 
-- 
2.17.1