5.10-stable patches

added patches:
	drm-edid-fix-avi-infoframe-aspect-ratio-handling.patch

diff --git a/queue-5.10/drm-edid-fix-avi-infoframe-aspect-ratio-handling.patch b/queue-5.10/drm-edid-fix-avi-infoframe-aspect-ratio-handling.patch
new file mode 100644 (file)
index 0000000..c55028f
--- /dev/null
+++ b/queue-5.10/drm-edid-fix-avi-infoframe-aspect-ratio-handling.patch
@@ -0,0 +1,83 @@
+From 1cbc1f0d324ba6c4d1b10ac6362b5e0b029f63d5 Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Wed, 4 Jan 2023 12:05:16 +0200
+Subject: drm/edid: fix AVI infoframe aspect ratio handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jani Nikula <jani.nikula@intel.com>
+
+commit 1cbc1f0d324ba6c4d1b10ac6362b5e0b029f63d5 upstream.
+
+We try to avoid sending VICs defined in the later specs in AVI
+infoframes to sinks that conform to the earlier specs, to not upset
+them, and use 0 for the VIC instead. However, we do this detection and
+conversion to 0 too early, as we'll need the actual VIC to figure out
+the aspect ratio.
+
+In particular, for a mode with 64:27 aspect ratio, 0 for VIC fails the
+AVI infoframe generation altogether with -EINVAL.
+
+Separate the VIC lookup from the "filtering", and postpone the
+filtering, to use the proper VIC for aspect ratio handling, and the 0
+VIC for the infoframe video code as needed.
+
+Reported-by: William Tseng <william.tseng@intel.com>
+Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6153
+References: https://lore.kernel.org/r/20220920062316.43162-1-william.tseng@intel.com
+Cc: <stable@vger.kernel.org>
+Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/c3e78cc6d01ed237f71ad0038826b08d83d75eef.1672826282.git.jani.nikula@intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/drm_edid.c |   21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -5560,8 +5560,6 @@ static u8 drm_mode_hdmi_vic(const struct
+ static u8 drm_mode_cea_vic(const struct drm_connector *connector,
+                          const struct drm_display_mode *mode)
+ {
+-      u8 vic;
+-
+       /*
+        * HDMI spec says if a mode is found in HDMI 1.4b 4K modes
+        * we should send its VIC in vendor infoframes, else send the
+@@ -5571,13 +5569,18 @@ static u8 drm_mode_cea_vic(const struct
+       if (drm_mode_hdmi_vic(connector, mode))
+               return 0;
+ 
+-      vic = drm_match_cea_mode(mode);
++      return drm_match_cea_mode(mode);
++}
+ 
+-      /*
+-       * HDMI 1.4 VIC range: 1 <= VIC <= 64 (CEA-861-D) but
+-       * HDMI 2.0 VIC range: 1 <= VIC <= 107 (CEA-861-F). So we
+-       * have to make sure we dont break HDMI 1.4 sinks.
+-       */
++/*
++ * Avoid sending VICs defined in HDMI 2.0 in AVI infoframes to sinks that
++ * conform to HDMI 1.4.
++ *
++ * HDMI 1.4 (CTA-861-D) VIC range: [1..64]
++ * HDMI 2.0 (CTA-861-F) VIC range: [1..107]
++ */
++static u8 vic_for_avi_infoframe(const struct drm_connector *connector, u8 vic)
++{
+       if (!is_hdmi2_sink(connector) && vic > 64)
+               return 0;
+ 
+@@ -5653,7 +5656,7 @@ drm_hdmi_avi_infoframe_from_display_mode
+               picture_aspect = HDMI_PICTURE_ASPECT_NONE;
+       }
+ 
+-      frame->video_code = vic;
++      frame->video_code = vic_for_avi_infoframe(connector, vic);
+       frame->picture_aspect = picture_aspect;
+       frame->active_aspect = HDMI_ACTIVE_ASPECT_PICTURE;
+       frame->scan_mode = HDMI_SCAN_MODE_UNDERSCAN;

diff --git a/queue-5.10/series b/queue-5.10/series
index 5ca8dc22089e805d04ee76eb6d54ad3e5169441e..b6af2c3b5dcdc3205ccada8dade190041b5ad7cb 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -426,3 +426,4 @@ pci-avoid-flr-for-amd-fch-ahci-adapters.patch
 vfio-type1-prevent-underflow-of-locked_vm-via-exec.patch
 drm-i915-quirks-add-inverted-backlight-quirk-for-hp-14-r206nv.patch
 drm-radeon-fix-edp-for-single-display-imac11-2.patch
+drm-edid-fix-avi-infoframe-aspect-ratio-handling.patch