Patch "drm/i915/display: BMG supports UHBR13.5" has been added to the 6.11-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/i915/display: BMG supports UHBR13.5

to the 6.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-i915-display-bmg-supports-uhbr13.5.patch
and it can be found in the queue-6.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 80deb0dc7d18cbe24348948e4e910894e5ebbd09
Author: Arun R Murthy <arun.r.murthy@xxxxxxxxx>
Date:   Tue Aug 27 13:42:05 2024 +0530

    drm/i915/display: BMG supports UHBR13.5
    
    [ Upstream commit fcd33d434d31a210bc9f209b5bfd92f3b91a2dda ]
    
    UHBR20 is not supported by battlemage and the maximum link rate
    supported is UHBR13.5
    
    v2: Replace IS_DGFX with IS_BATTLEMAGE (Jani)
    
    HSD: 16023263677
    Signed-off-by: Arun R Murthy <arun.r.murthy@xxxxxxxxx>
    Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx>
    Fixes: 98b1c87a5e51 ("drm/i915/xe2hpd: Set maximum DP rate to UHBR13.5")
    Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240827081205.136569-1-arun.r.murthy@xxxxxxxxx
    (cherry picked from commit 9c2338ac4543e0fab3a1e0f9f025591e0f0d9f8f)
    Signed-off-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index ebe7fe5417ae4..2a7deac73b2eb 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -535,6 +535,10 @@ static void
 intel_dp_set_source_rates(struct intel_dp *intel_dp)
 {
 	/* The values must be in increasing order */
+	static const int bmg_rates[] = {
+		162000, 216000, 243000, 270000, 324000, 432000, 540000, 675000,
+		810000,	1000000, 1350000,
+	};
 	static const int mtl_rates[] = {
 		162000, 216000, 243000, 270000, 324000, 432000, 540000, 675000,
 		810000,	1000000, 2000000,
@@ -565,8 +569,13 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
 		    intel_dp->source_rates || intel_dp->num_source_rates);
 
 	if (DISPLAY_VER(dev_priv) >= 14) {
-		source_rates = mtl_rates;
-		size = ARRAY_SIZE(mtl_rates);
+		if (IS_BATTLEMAGE(dev_priv)) {
+			source_rates = bmg_rates;
+			size = ARRAY_SIZE(bmg_rates);
+		} else {
+			source_rates = mtl_rates;
+			size = ARRAY_SIZE(mtl_rates);
+		}
 		max_rate = mtl_max_source_rate(intel_dp);
 	} else if (DISPLAY_VER(dev_priv) >= 11) {
 		source_rates = icl_rates;