4.9-stable patches

added patches:
	docs-conf.py-cope-with-removal-of-language-none-in-sphinx-5.0.0.patch
	dt-bindings-gpio-altera-correct-interrupt-cells.patch
	gma500-fix-an-incorrect-null-check-on-list-iterator.patch

diff --git a/queue-4.9/docs-conf.py-cope-with-removal-of-language-none-in-sphinx-5.0.0.patch b/queue-4.9/docs-conf.py-cope-with-removal-of-language-none-in-sphinx-5.0.0.patch
new file mode 100644 (file)
index 0000000..12aac3c
--- /dev/null
+++ b/queue-4.9/docs-conf.py-cope-with-removal-of-language-none-in-sphinx-5.0.0.patch
@@ -0,0 +1,48 @@
+From 627f01eab93d8671d4e4afee9b148f9998d20e7c Mon Sep 17 00:00:00 2001
+From: Akira Yokosawa <akiyks@gmail.com>
+Date: Wed, 1 Jun 2022 23:34:06 +0900
+Subject: docs/conf.py: Cope with removal of language=None in Sphinx 5.0.0
+
+From: Akira Yokosawa <akiyks@gmail.com>
+
+commit 627f01eab93d8671d4e4afee9b148f9998d20e7c upstream.
+
+One of the changes in Sphinx 5.0.0 [1] says [sic]:
+
+    5.0.0 final
+
+     - #10474: language does not accept None as it value.
+       The default value of language becomes to 'en' now.
+
+[1]: https://www.sphinx-doc.org/en/master/changes.html#release-5-0-0-released-may-30-2022
+
+It results in a new warning from Sphinx 5.0.0 [sic]:
+
+    WARNING: Invalid configuration value found: 'language = None'.
+    Update your configuration to a valid langauge code. Falling
+    back to 'en' (English).
+
+Silence the warning by using 'en'.
+It works with all the Sphinx versions required for building
+kernel documentation (1.7.9 or later).
+
+Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
+Link: https://lore.kernel.org/r/bd0c2ddc-2401-03cb-4526-79ca664e1cbe@gmail.com
+Cc: stable@vger.kernel.org
+Signed-off-by: Jonathan Corbet <corbet@lwn.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/conf.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Documentation/conf.py
++++ b/Documentation/conf.py
+@@ -96,7 +96,7 @@ finally:
+ #
+ # This is also used if you do content translation via gettext catalogs.
+ # Usually you set "language" from the command line for these cases.
+-language = None
++language = 'en'
+ 
+ # There are two options for replacing |today|: either, you set today to some
+ # non-false value, then it is used:

diff --git a/queue-4.9/dt-bindings-gpio-altera-correct-interrupt-cells.patch b/queue-4.9/dt-bindings-gpio-altera-correct-interrupt-cells.patch
new file mode 100644 (file)
index 0000000..402c2aa
--- /dev/null
+++ b/queue-4.9/dt-bindings-gpio-altera-correct-interrupt-cells.patch
@@ -0,0 +1,40 @@
+From 3a21c3ac93aff7b4522b152399df8f6a041df56d Mon Sep 17 00:00:00 2001
+From: Dinh Nguyen <dinguyen@kernel.org>
+Date: Wed, 11 May 2022 12:54:46 -0500
+Subject: dt-bindings: gpio: altera: correct interrupt-cells
+
+From: Dinh Nguyen <dinguyen@kernel.org>
+
+commit 3a21c3ac93aff7b4522b152399df8f6a041df56d upstream.
+
+update documentation to correctly state the interrupt-cells to be 2.
+
+Cc: stable@vger.kernel.org
+Fixes: 4fd9bbc6e071 ("drivers/gpio: Altera soft IP GPIO driver devicetree binding")
+Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/devicetree/bindings/gpio/gpio-altera.txt |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/Documentation/devicetree/bindings/gpio/gpio-altera.txt
++++ b/Documentation/devicetree/bindings/gpio/gpio-altera.txt
+@@ -9,8 +9,9 @@ Required properties:
+   - The second cell is reserved and is currently unused.
+ - gpio-controller : Marks the device node as a GPIO controller.
+ - interrupt-controller: Mark the device node as an interrupt controller
+-- #interrupt-cells : Should be 1. The interrupt type is fixed in the hardware.
++- #interrupt-cells : Should be 2. The interrupt type is fixed in the hardware.
+   - The first cell is the GPIO offset number within the GPIO controller.
++  - The second cell is the interrupt trigger type and level flags.
+ - interrupts: Specify the interrupt.
+ - altr,interrupt-type: Specifies the interrupt trigger type the GPIO
+   hardware is synthesized. This field is required if the Altera GPIO controller
+@@ -38,6 +39,6 @@ gpio_altr: gpio@0xff200000 {
+       altr,interrupt-type = <IRQ_TYPE_EDGE_RISING>;
+       #gpio-cells = <2>;
+       gpio-controller;
+-      #interrupt-cells = <1>;
++      #interrupt-cells = <2>;
+       interrupt-controller;
+ };

diff --git a/queue-4.9/gma500-fix-an-incorrect-null-check-on-list-iterator.patch b/queue-4.9/gma500-fix-an-incorrect-null-check-on-list-iterator.patch
new file mode 100644 (file)
index 0000000..bccf06a
--- /dev/null
+++ b/queue-4.9/gma500-fix-an-incorrect-null-check-on-list-iterator.patch
@@ -0,0 +1,49 @@
+From bdef417d84536715145f6dc9cc3275c46f26295a Mon Sep 17 00:00:00 2001
+From: Xiaomeng Tong <xiam0nd.tong@gmail.com>
+Date: Sun, 27 Mar 2022 13:20:28 +0800
+Subject: gma500: fix an incorrect NULL check on list iterator
+
+From: Xiaomeng Tong <xiam0nd.tong@gmail.com>
+
+commit bdef417d84536715145f6dc9cc3275c46f26295a upstream.
+
+The bug is here:
+       return crtc;
+
+The list iterator value 'crtc' will *always* be set and non-NULL by
+list_for_each_entry(), so it is incorrect to assume that the iterator
+value will be NULL if the list is empty or no element is found.
+
+To fix the bug, return 'crtc' when found, otherwise return NULL.
+
+Cc: stable@vger.kernel.org
+fixes: 89c78134cc54d ("gma500: Add Poulsbo support")
+Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
+Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220327052028.2013-1-xiam0nd.tong@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/gma500/psb_intel_display.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/gma500/psb_intel_display.c
++++ b/drivers/gpu/drm/gma500/psb_intel_display.c
+@@ -548,14 +548,15 @@ void psb_intel_crtc_init(struct drm_devi
+ 
+ struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
+ {
+-      struct drm_crtc *crtc = NULL;
++      struct drm_crtc *crtc;
+ 
+       list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+               struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
++
+               if (gma_crtc->pipe == pipe)
+-                      break;
++                      return crtc;
+       }
+-      return crtc;
++      return NULL;
+ }
+ 
+ int gma_connector_clones(struct drm_device *dev, int type_mask)

diff --git a/queue-4.9/series b/queue-4.9/series
index 554061160f96d9a324532fefe9a49c43b911fece..0ec491a95496a3321937be30f38ca279950cfa66 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -100,3 +100,6 @@ hugetlb-fix-huge_pmd_unshare-address-update.patch
 rtl818x-prevent-using-not-initialized-queues.patch
 asoc-rt5514-fix-event-generation-for-dsp-voice-wake-up-control.patch
 carl9170-tx-fix-an-incorrect-use-of-list-iterator.patch
+gma500-fix-an-incorrect-null-check-on-list-iterator.patch
+docs-conf.py-cope-with-removal-of-language-none-in-sphinx-5.0.0.patch
+dt-bindings-gpio-altera-correct-interrupt-cells.patch