With all essential kernel driver and user-space patches merged, GK20A can now
be enabled safely on Tegra124 devices. This series makes small device tree
and configuration adjustments to allow this.
It leaves the GK20A nodes ready to be used, but still disabled. Enabling the
nodes is the work of the bootloader, after it has configured VPR properly.
U-boot patches that do this are in the work. In the meantime, it is safe to
merge this kernel support.
Alexandre Courbot (3):
ARM: tegra: Add IOMMU node to GK20A
ARM: tegra: jetson-tk1: Add GK20A GPU DT node
ARM: tegra: Enable Nouveau in defconfig
Thierry Reding (1):
ARM: tegra: venice2: Add GK20A GPU DT node
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 10 +++++++++-
arch/arm/boot/dts/tegra124-venice2.dts | 10 +++++++++-
arch/arm/boot/dts/tegra124.dtsi | 3 +++
arch/arm/configs/tegra_defconfig | 3 +++
4 files changed, 24 insertions(+), 2 deletions(-)
--
2.4.4
Nouveau can make use of the IOMMU to make physical appear linear in the
GPU address space.
Signed-off-by: Alexandre Courbot <[email protected]>
---
arch/arm/boot/dts/tegra124.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 13cc7ca5e031..bffe90236bf8 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -188,6 +188,9 @@
clock-names = "gpu", "pwr";
resets = <&tegra_car 184>;
reset-names = "gpu";
+
+ iommus = <&mc TEGRA_SWGROUP_GPU>;
+
status = "disabled";
};
--
2.4.4
From: Thierry Reding <[email protected]>
Add the device-tree node for the GK20A GPU and leave it disabled.
It is the responsability of the bootloader to enable it if the
VPR registers have been programmed such as the GPU can operate.
Signed-off-by: Thierry Reding <[email protected]>
Signed-off-by: Alexandre Courbot <[email protected]>
---
arch/arm/boot/dts/tegra124-venice2.dts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 5c3f7813360d..497a50ebfe44 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -43,6 +43,14 @@
};
};
+ gpu@0,57000000 {
+ /*
+ * Node left disabled on purpose - the bootloader will enable
+ * it after having set the VPR up
+ */
+ vdd-supply = <&vdd_gpu>;
+ };
+
pinmux: pinmux@0,70000868 {
pinctrl-names = "boot";
pinctrl-0 = <&pinmux_boot>;
@@ -735,7 +743,7 @@
regulator-always-on;
};
- sd6 {
+ vdd_gpu: sd6 {
regulator-name = "+VDD_GPU_AP";
regulator-min-microvolt = <650000>;
regulator-max-microvolt = <1200000>;
--
2.4.4
Add the device-tree node for the GK20A GPU and leave it disabled.
It is the responsability of the bootloader to enable it if the
VPR registers have been programmed such as the GPU can operate.
Signed-off-by: Alexandre Courbot <[email protected]>
---
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index ed8a8acd3d34..f0459ea94981 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -53,6 +53,14 @@
};
};
+ gpu@0,57000000 {
+ /*
+ * Node left disabled on purpose - the bootloader will enable
+ * it after having set the VPR up
+ */
+ vdd-supply = <&vdd_gpu>;
+ };
+
pinmux: pinmux@0,70000868 {
pinctrl-names = "boot";
pinctrl-0 = <&state_boot>;
@@ -1514,7 +1522,7 @@
regulator-always-on;
};
- sd6 {
+ vdd_gpu: sd6 {
regulator-name = "+VDD_GPU_AP";
regulator-min-microvolt = <650000>;
regulator-max-microvolt = <1200000>;
--
2.4.4
Since Nouveau support is complete, enable it in the Tegra configuration
so supported boards can take advantage of it.
Signed-off-by: Alexandre Courbot <[email protected]>
---
arch/arm/configs/tegra_defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index d199eb249151..a5ef73116fdd 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -292,3 +292,6 @@ CONFIG_EARLY_PRINTK=y
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRC_CCITT=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
--
2.4.4
On Wed, Jul 01, 2015 at 06:13:44PM +0900, Alexandre Courbot wrote:
> With all essential kernel driver and user-space patches merged, GK20A can now
> be enabled safely on Tegra124 devices. This series makes small device tree
> and configuration adjustments to allow this.
>
> It leaves the GK20A nodes ready to be used, but still disabled. Enabling the
> nodes is the work of the bootloader, after it has configured VPR properly.
>
> U-boot patches that do this are in the work. In the meantime, it is safe to
> merge this kernel support.
>
> Alexandre Courbot (3):
> ARM: tegra: Add IOMMU node to GK20A
> ARM: tegra: jetson-tk1: Add GK20A GPU DT node
> ARM: tegra: Enable Nouveau in defconfig
>
> Thierry Reding (1):
> ARM: tegra: venice2: Add GK20A GPU DT node
>
> arch/arm/boot/dts/tegra124-jetson-tk1.dts | 10 +++++++++-
> arch/arm/boot/dts/tegra124-venice2.dts | 10 +++++++++-
> arch/arm/boot/dts/tegra124.dtsi | 3 +++
> arch/arm/configs/tegra_defconfig | 3 +++
> 4 files changed, 24 insertions(+), 2 deletions(-)
Applied, thanks.
Thierry