drm/i915/mst: Fix .mode_valid_ctx() return values
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 27 Nov 2023 14:50:26 +0000 (16:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Dec 2023 17:45:25 +0000 (18:45 +0100)
commit 7cf82b25dd91d7f330d9df2de868caca14289ba1 upstream.

.mode_valid_ctx() returns an errno, not the mode status. Fix
the code to do the right thing.

Cc: stable@vger.kernel.org
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Fixes: d51f25eb479a ("drm/i915: Add DSC support to MST path")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231127145028.4899-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
(cherry picked from commit c1799032d2ef6616113b733428dfaa2199a5604b)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/display/intel_dp_mst.c

index e3f176a..ccea5ea 100644 (file)
@@ -988,11 +988,15 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
         * Big joiner configuration needs DSC for TGL which is not true for
         * XE_LPD where uncompressed joiner is supported.
         */
-       if (DISPLAY_VER(dev_priv) < 13 && bigjoiner && !dsc)
-               return MODE_CLOCK_HIGH;
+       if (DISPLAY_VER(dev_priv) < 13 && bigjoiner && !dsc) {
+               *status = MODE_CLOCK_HIGH;
+               return 0;
+       }
 
-       if (mode_rate > max_rate && !dsc)
-               return MODE_CLOCK_HIGH;
+       if (mode_rate > max_rate && !dsc) {
+               *status = MODE_CLOCK_HIGH;
+               return 0;
+       }
 
        *status = intel_mode_valid_max_plane_size(dev_priv, mode, false);
        return 0;