Move dtb patches into debian patches dir, not part of upstream source

5 files changed, 174 insertions, 1 deletions

diff --git a/debian/patches/dtb-add-deferring-in-log-when-clock-or-regul.patch b/debian/patches/dtb-add-deferring-in-log-when-clock-or-regul.patch
new file mode 100644
index 0000000..f2632d5
--- /dev/null
+++ b/debian/patches/dtb-add-deferring-in-log-when-clock-or-regul.patch
@@ -0,0 +1,48 @@
+Description: Add patches to make driver compatible with upstream DTB mali support
+ Set of patches to make driver recognise upstream DTB info
+Author: Guillaume Tucker
+Last-Update: 2017-12-15
+
+--- /dev/null
++++ a/driver/product/kernel/drivers/gpu/arm/midgard/patches/0004-gpu-midgard-add-deferring-in-log-when-clock-or-regul.patch
+@@ -0,0 +1,40 @@
++From bbbffd7ddf71fbfbea2437a9111a338e0cf26a5d Mon Sep 17 00:00:00 2001
++From: Guillaume Tucker <guillaume.tucker@collabora.com>
++Date: Mon, 27 Mar 2017 15:33:43 +0100
++Subject: [PATCH 4/4] gpu: midgard: add "deferring" in log when clock or
++ regulator not found
++
++Update log messages to show that a failure to find the Mali GPU clock
++or regulator results in a later retry (-EPROBE_DEFER).
++
++Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
++---
++ drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 6 ++++--
++ 1 file changed, 4 insertions(+), 2 deletions(-)
++
++diff --git a/mali_kbase_core_linux.c b/mali_kbase_core_linux.c
++index 945f222e6d9e..abc931794275 100644
++--- a/mali_kbase_core_linux.c
+++++ b/mali_kbase_core_linux.c
++@@ -3260,7 +3260,8 @@ static int power_control_init(struct platform_device *pdev)
++ 		err = PTR_ERR(kbdev->regulator);
++ 		kbdev->regulator = NULL;
++ 		if (err == -EPROBE_DEFER) {
++-			dev_err(&pdev->dev, "Failed to get regulator\n");
+++			dev_err(&pdev->dev,
+++				"Failed to get regulator, deferring.\n");
++ 			return err;
++ 		}
++ 		dev_info(kbdev->dev,
++@@ -3274,7 +3275,8 @@ static int power_control_init(struct platform_device *pdev)
++ 		err = PTR_ERR(kbdev->clock);
++ 		kbdev->clock = NULL;
++ 		if (err == -EPROBE_DEFER) {
++-			dev_err(&pdev->dev, "Failed to get clock\n");
+++			dev_err(&pdev->dev,
+++				"Failed to get clock, deferring.\n");
++ 			goto fail;
++ 		}
++ 		dev_info(kbdev->dev, "Continuing without Mali clock control\n");
++--
++2.11.0
diff --git a/debian/patches/dtb-drop-clk_mali-name.patch b/debian/patches/dtb-drop-clk_mali-name.patch
new file mode 100644
index 0000000..19c56d0
--- /dev/null
+++ b/debian/patches/dtb-drop-clk_mali-name.patch
@@ -0,0 +1,37 @@
+Description: Add patches to make driver compatible with upstream DTB mali support
+ gpu-midgard-drop-clk_mali-name.patch
+Author: Guillaume Tucker
+Last-Update: 2017-12-15
+
+--- /dev/null
++++ a/driver/product/kernel/drivers/gpu/arm/midgard/patches/0002-gpu-midgard-drop-clk_mali-name.patch
+@@ -0,0 +1,29 @@
++From 92f20fec63bdbb7341135875f6579b148ac07574 Mon Sep 17 00:00:00 2001
++From: Guillaume Tucker <guillaume.tucker@collabora.com>
++Date: Tue, 11 Apr 2017 18:45:01 +0100
++Subject: [PATCH 2/4] gpu: midgard: drop "clk_mali" name
++
++As the "clock-names" entry has been removed from the device tree, also
++remove the clock name "clk_mali" in the driver to get the only clock
++without any name.
++
++Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
++---
++ drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/mali_kbase_core_linux.c b/mali_kbase_core_linux.c
++index 6cba3e2318ed..d35ca2bb446c 100644
++--- a/mali_kbase_core_linux.c
+++++ b/mali_kbase_core_linux.c
++@@ -3269,7 +3269,7 @@ static int power_control_init(struct platform_device *pdev)
++ 	}
++ #endif /* LINUX_VERSION_CODE >= 3, 12, 0 */
++
++-	kbdev->clock = clk_get(kbdev->dev, "clk_mali");
+++	kbdev->clock = clk_get(kbdev->dev, NULL);
++ 	if (IS_ERR_OR_NULL(kbdev->clock)) {
++ 		err = PTR_ERR(kbdev->clock);
++ 		kbdev->clock = NULL;
++--
++2.11.0
diff --git a/debian/patches/dtb-look-for-lower-case-IRQ-names.patch b/debian/patches/dtb-look-for-lower-case-IRQ-names.patch
new file mode 100644
index 0000000..991a45f
--- /dev/null
+++ b/debian/patches/dtb-look-for-lower-case-IRQ-names.patch
@@ -0,0 +1,42 @@
+Description: Add patches to make driver compatible with upstream DTB mali support
+ gpu-midgard-look-for-lower-case-IRQ-names.patch
+Author: Guillaume Tucker
+Last-Update: 2017-12-15
+
+--- /dev/null
++++ a/driver/product/kernel/drivers/gpu/arm/midgard/patches/0003-gpu-midgard-look-for-lower-case-IRQ-names.patch
+@@ -0,0 +1,34 @@
++From 3fd3833a2f2862bcb4e464a4298ec8e061e83e0f Mon Sep 17 00:00:00 2001
++From: Guillaume Tucker <guillaume.tucker@collabora.com>
++Date: Tue, 11 Apr 2017 19:18:02 +0100
++Subject: [PATCH 3/4] gpu: midgard: look for lower-case IRQ names
++
++As the interrupt-names have been changed to lower-case, adjust the
++driver accordingly.
++
++Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
++---
++ drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/mali_kbase_core_linux.c b/mali_kbase_core_linux.c
++index d35ca2bb446c..945f222e6d9e 100644
++--- a/mali_kbase_core_linux.c
+++++ b/mali_kbase_core_linux.c
++@@ -1057,11 +1057,11 @@ static int assign_irqs(struct platform_device *pdev)
++ 		}
++
++ #ifdef CONFIG_OF
++-		if (!strncmp(irq_res->name, "JOB", 4)) {
+++		if (!strncmp(irq_res->name, "job", 4)) {
++ 			irqtag = JOB_IRQ_TAG;
++-		} else if (!strncmp(irq_res->name, "MMU", 4)) {
+++		} else if (!strncmp(irq_res->name, "mmu", 4)) {
++ 			irqtag = MMU_IRQ_TAG;
++-		} else if (!strncmp(irq_res->name, "GPU", 4)) {
+++		} else if (!strncmp(irq_res->name, "gpu", 4)) {
++ 			irqtag = GPU_IRQ_TAG;
++ 		} else {
++ 			dev_err(&pdev->dev, "Invalid irq res name: '%s'\n",
++--
++2.11.0
diff --git a/debian/patches/dtb-replace-device-tree-comptible-strings.patch b/debian/patches/dtb-replace-device-tree-comptible-strings.patch
new file mode 100644
index 0000000..9dfb6f6
--- /dev/null
+++ b/debian/patches/dtb-replace-device-tree-comptible-strings.patch
@@ -0,0 +1,43 @@
+Description: Add patches to make driver compatible with upstream DTB mali support
+ gpu-midgard-replace-device-tree-compatible-strings.patch
+Author: Guillaume Tucker
+Last-Update: 2017-12-15
+
+--- /dev/null
++++ a/driver/product/kernel/drivers/gpu/arm/midgard/patches/0001-gpu-midgard-replace-device-tree-compatible-strings.patch
+@@ -0,0 +1,35 @@
++From cb4a8e9b23464953ddf3898095e08670e8a8f6ea Mon Sep 17 00:00:00 2001
++From: Guillaume Tucker <guillaume.tucker@collabora.com>
++Date: Wed, 12 Apr 2017 17:27:29 +0100
++Subject: [PATCH 1/4] gpu: midgard: replace device tree compatible strings
++
++Replace the list of device tree compatible strings with all the Mali
++Midgard GPU types to match the device tree bindings documentation.
++
++Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
++---
++ drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 9 ++++++++-
++ 1 file changed, 8 insertions(+), 1 deletion(-)
++
++diff --git a/mali_kbase_core_linux.c b/mali_kbase_core_linux.c
++index 4e95633c307f..6cba3e2318ed 100644
++--- a/mali_kbase_core_linux.c
+++++ b/mali_kbase_core_linux.c
++@@ -4161,7 +4161,14 @@ static const struct dev_pm_ops kbase_pm_ops = {
++
++ #ifdef CONFIG_OF
++ static const struct of_device_id kbase_dt_ids[] = {
++-	{ .compatible = "arm,malit6xx" },
+++	{ .compatible = "arm,mali-t604" },
+++	{ .compatible = "arm,mali-t624" },
+++	{ .compatible = "arm,mali-t628" },
+++	{ .compatible = "arm,mali-t720" },
+++	{ .compatible = "arm,mali-t760" },
+++	{ .compatible = "arm,mali-t820" },
+++	{ .compatible = "arm,mali-t860" },
+++	{ .compatible = "arm,mali-t880" },
++ 	{ .compatible = "arm,mali-midgard" },
++ 	{ /* sentinel */ }
++ };
++--
++2.11.0
diff --git a/debian/patches/series b/debian/patches/series
index ad2b79b..797e10d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,7 @@ user-buf-map-api-update.patch
 use-vmf-struct-update.patch
 timestamp-zero-update.patch
 include-sched-mm-fix.patch
-
+dtb-add-deferring-in-log-when-clock-or-regul.patch
+dtb-drop-clk_mali-name.patch
+dtb-look-for-lower-case-IRQ-names.patch
+dtb-replace-device-tree-comptible-strings.patch