From: Greg Kroah-Hartman Date: Mon, 29 Jul 2024 09:59:19 +0000 (+0200) Subject: drop queue-6.10/drm-i915-display-for-mtl-platforms-skip-mg-dp-programming.patch X-Git-Tag: v6.1.103~88 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22f969b162dc68110a940550fe34a5493488ac63;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.10/drm-i915-display-for-mtl-platforms-skip-mg-dp-programming.patch --- diff --git a/queue-6.10/drm-i915-display-for-mtl-platforms-skip-mg-dp-programming.patch b/queue-6.10/drm-i915-display-for-mtl-platforms-skip-mg-dp-programming.patch deleted file mode 100644 index a74ce4ea3f6..00000000000 --- a/queue-6.10/drm-i915-display-for-mtl-platforms-skip-mg-dp-programming.patch +++ /dev/null @@ -1,42 +0,0 @@ -From aaf9dc86bd806458f848c39057d59e5aa652a399 Mon Sep 17 00:00:00 2001 -From: Imre Deak -Date: Tue, 25 Jun 2024 14:18:40 +0300 -Subject: drm/i915/display: For MTL+ platforms skip mg dp programming - -From: Imre Deak - -commit aaf9dc86bd806458f848c39057d59e5aa652a399 upstream. - -For MTL+ platforms we use PICA chips for Type-C support and -hence mg programming is not needed. - -Fixes issue with drm warn of TC port not being in legacy mode. - -Cc: stable@vger.kernel.org - -Signed-off-by: Mika Kahola -Signed-off-by: Imre Deak -Reviewed-by: Gustavo Sousa -Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.kahola@intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c -index bb13a3ca8c7c..6672fc162c4f 100644 ---- a/drivers/gpu/drm/i915/display/intel_ddi.c -+++ b/drivers/gpu/drm/i915/display/intel_ddi.c -@@ -2096,6 +2096,9 @@ icl_program_mg_dp_mode(struct intel_digital_port *dig_port, - u32 ln0, ln1, pin_assignment; - u8 width; - -+ if (DISPLAY_VER(dev_priv) >= 14) -+ return; -+ - if (!intel_encoder_is_tc(&dig_port->base) || - intel_tc_port_in_tbt_alt_mode(dig_port)) - return; --- -2.45.2 - diff --git a/queue-6.10/series b/queue-6.10/series index b6e78e08a70..28acdcb52b6 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -579,5 +579,4 @@ drm-gma500-fix-null-pointer-dereference-in-cdv_intel_lvds_get_modes.patch drm-gma500-fix-null-pointer-dereference-in-psb_intel_lvds_get_modes.patch drm-amd-display-fix-corruption-with-high-refresh-rates-on-dcn-3.0.patch scsi-qla2xxx-fix-optrom-version-displayed-in-fdmi.patch -drm-i915-display-for-mtl-platforms-skip-mg-dp-programming.patch drm-amd-display-check-for-null-pointer.patch