5.6-stable patches

added patches:
	drm-bridge-analogix-anx6345-avoid-duplicate-supply-suffix.patch
	drm-i915-display-fix-mode-private_flags-comparison-at-atomic_check.patch

diff --git a/queue-5.6/drm-bridge-analogix-anx6345-avoid-duplicate-supply-suffix.patch b/queue-5.6/drm-bridge-analogix-anx6345-avoid-duplicate-supply-suffix.patch
new file mode 100644 (file)
index 0000000..98866c1
--- /dev/null
+++ b/queue-5.6/drm-bridge-analogix-anx6345-avoid-duplicate-supply-suffix.patch
@@ -0,0 +1,42 @@
+From 6726ca1a2d531f5a6efc1f785b15606ce837c4dc Mon Sep 17 00:00:00 2001
+From: Torsten Duwe <duwe@lst.de>
+Date: Tue, 18 Feb 2020 16:54:40 +0100
+Subject: drm/bridge: analogix-anx6345: Avoid duplicate -supply suffix
+
+From: Torsten Duwe <duwe@lst.de>
+
+commit 6726ca1a2d531f5a6efc1f785b15606ce837c4dc upstream.
+
+of_get_regulator() will unconditionally add "-supply" to form the
+property name. This is documented in commit 69511a452e6dc ("map consumer
+regulator based on device tree"). Remove the suffix from the requests.
+
+Signed-off-by: Torsten Duwe <duwe@lst.de>
+Reviewed-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
+Link: https://patchwork.freedesktop.org/patch/msgid/20200218155440.BEFB968C65@verein.lst.de
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
++++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
+@@ -711,14 +711,14 @@ static int anx6345_i2c_probe(struct i2c_
+               DRM_DEBUG("No panel found\n");
+ 
+       /* 1.2V digital core power regulator  */
+-      anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply");
++      anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12");
+       if (IS_ERR(anx6345->dvdd12)) {
+               DRM_ERROR("dvdd12-supply not found\n");
+               return PTR_ERR(anx6345->dvdd12);
+       }
+ 
+       /* 2.5V digital core power regulator  */
+-      anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply");
++      anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25");
+       if (IS_ERR(anx6345->dvdd25)) {
+               DRM_ERROR("dvdd25-supply not found\n");
+               return PTR_ERR(anx6345->dvdd25);

diff --git a/queue-5.6/drm-i915-display-fix-mode-private_flags-comparison-at-atomic_check.patch b/queue-5.6/drm-i915-display-fix-mode-private_flags-comparison-at-atomic_check.patch
new file mode 100644 (file)
index 0000000..4691984
--- /dev/null
+++ b/queue-5.6/drm-i915-display-fix-mode-private_flags-comparison-at-atomic_check.patch
@@ -0,0 +1,59 @@
+From 2bdd4c28baff29163808677a70942de2b45f17dc Mon Sep 17 00:00:00 2001
+From: Uma Shankar <uma.shankar@intel.com>
+Date: Thu, 26 Mar 2020 18:21:11 +0530
+Subject: drm/i915/display: Fix mode private_flags comparison at atomic_check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Uma Shankar <uma.shankar@intel.com>
+
+commit 2bdd4c28baff29163808677a70942de2b45f17dc upstream.
+
+This patch fixes the private_flags of mode to be checked and
+compared against uapi.mode and not from hw.mode. This helps
+properly trigger modeset at boot if desired by driver.
+
+It helps resolve audio_codec initialization issues if display
+is connected at boot. Initial discussion on this issue has happened
+on below thread:
+https://patchwork.freedesktop.org/series/74828/
+
+v2: No functional change. Fixed the Closes tag and added
+Maarten's RB.
+
+v3: Added Fixes tag.
+
+Cc: Ville Syrjä <ville.syrjala@linux.intel.com>
+Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
+Cc: Souza, Jose <jose.souza@intel.com>
+Fixes: 58d124ea2739 ("drm/i915: Complete crtc hw/uapi split, v6.")
+Closes: https://gitlab.freedesktop.org/drm/intel/issues/1363
+Suggested-by: Ville Syrjä <ville.syrjala@linux.intel.com>
+Signed-off-by: Uma Shankar <uma.shankar@intel.com>
+Signed-off-by: SweeAun Khor <swee.aun.khor@intel.com>
+Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20200326125111.11081-1-uma.shankar@intel.com
+(cherry picked from commit d5e56705927e00f703b2eb5a98299dd6622d16e5)
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Cc: Giacomo Comes <comes@naic.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/display/intel_display.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/display/intel_display.c
++++ b/drivers/gpu/drm/i915/display/intel_display.c
+@@ -14582,8 +14582,8 @@ static int intel_atomic_check(struct drm
+       /* Catch I915_MODE_FLAG_INHERITED */
+       for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
+                                           new_crtc_state, i) {
+-              if (new_crtc_state->hw.mode.private_flags !=
+-                  old_crtc_state->hw.mode.private_flags)
++              if (new_crtc_state->uapi.mode.private_flags !=
++                  old_crtc_state->uapi.mode.private_flags)
+                       new_crtc_state->uapi.mode_changed = true;
+       }
+ 

diff --git a/queue-5.6/series b/queue-5.6/series
index 7fb76e465962c76a0e034578ac4abaea0bf69c9e..fb5db1bb1b20bb6dcc90a0a8803ba8f96f2b64a7 100644 (file)
--- a/queue-5.6/series
+++ b/queue-5.6/series
@@ -10,3 +10,5 @@ padata-fix-uninitialized-return-value-in-padata_repl.patch
 brcmfmac-abort-and-release-host-after-error.patch
 bpf-fix-tnum-constraints-for-32-bit-comparisons.patch
 xarray-fix-xa_find_next-for-large-multi-index-entrie.patch
+drm-bridge-analogix-anx6345-avoid-duplicate-supply-suffix.patch
+drm-i915-display-fix-mode-private_flags-comparison-at-atomic_check.patch