July 2024 - Linux-stable-mirror

FAILED: patch "[PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x f72383371e8c5d1d108532d7e395ff2c277233e5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070843-concrete-lather-a4a3@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: f72383371e8c ("drm/i915/display: For MTL+ platforms skip mg dp programming") 7fcf755896a3 ("drm/i915/display: use intel_encoder_is/to_* functions") 0a099232d254 ("drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state()") 684a37a6ffa9 ("drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active()") 65ea19a698f2 ("drm/i915/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin()") 6a8c66bf0e56 ("drm/i915: Don't explode when the dig port we don't have an AUX CH") d5c7854b50e6 ("drm/i915/xe2lpd: Move D2D enable/disable") 2e4b90fbe755 ("drm/i915: Filter out glitches on HPD lines during hotplug detection") 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") 00076671a648 ("drm/i915/display: Move colorimetry_support from intel_psr to intel_dp") e11300a1d8e3 ("drm/i915/display: Remove intel_crtc_state->psr_vsc") 561322c3bc14 ("drm/i915/display: Skip state verification with TBT-ALT mode") 7966a93a27cf ("drm/i915: Push audio enable/disable further out") 59be90248b42 ("drm/i915/mtl: C20 state verification") 3257e55d3ea7 ("drm/i915/panelreplay: enable/disable panel replay") b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") dd8f2298e34b ("drm/i915/psr: Move psr specific dpcd init into own function") 36f579ffc692 ("drm/i915/dp_mst: Improve BW sharing between MST streams") e37137380931 ("drm/i915/dp_mst: Force modeset CRTC if DSC toggling requires it") b2608c6b3212 ("drm/i915/dp_mst: Enable MST DSC decompression for all streams") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f72383371e8c5d1d108532d7e395ff2c277233e5 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Tue, 25 Jun 2024 14:18:40 +0300 Subject: [PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming 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(a)vger.kernel.org Signed-off-by: Mika Kahola <mika.kahola(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.… (cherry picked from commit aaf9dc86bd806458f848c39057d59e5aa652a399) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3c3fc53376ce..6bff169fa8d4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2088,6 +2088,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;

9 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x f72383371e8c5d1d108532d7e395ff2c277233e5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070843-geriatric-salaried-2036@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: f72383371e8c ("drm/i915/display: For MTL+ platforms skip mg dp programming") 7fcf755896a3 ("drm/i915/display: use intel_encoder_is/to_* functions") 0a099232d254 ("drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state()") 684a37a6ffa9 ("drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active()") 65ea19a698f2 ("drm/i915/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin()") 6a8c66bf0e56 ("drm/i915: Don't explode when the dig port we don't have an AUX CH") d5c7854b50e6 ("drm/i915/xe2lpd: Move D2D enable/disable") 2e4b90fbe755 ("drm/i915: Filter out glitches on HPD lines during hotplug detection") 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") 00076671a648 ("drm/i915/display: Move colorimetry_support from intel_psr to intel_dp") e11300a1d8e3 ("drm/i915/display: Remove intel_crtc_state->psr_vsc") 561322c3bc14 ("drm/i915/display: Skip state verification with TBT-ALT mode") 7966a93a27cf ("drm/i915: Push audio enable/disable further out") 59be90248b42 ("drm/i915/mtl: C20 state verification") 3257e55d3ea7 ("drm/i915/panelreplay: enable/disable panel replay") b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") dd8f2298e34b ("drm/i915/psr: Move psr specific dpcd init into own function") 36f579ffc692 ("drm/i915/dp_mst: Improve BW sharing between MST streams") e37137380931 ("drm/i915/dp_mst: Force modeset CRTC if DSC toggling requires it") b2608c6b3212 ("drm/i915/dp_mst: Enable MST DSC decompression for all streams") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f72383371e8c5d1d108532d7e395ff2c277233e5 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Tue, 25 Jun 2024 14:18:40 +0300 Subject: [PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming 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(a)vger.kernel.org Signed-off-by: Mika Kahola <mika.kahola(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.… (cherry picked from commit aaf9dc86bd806458f848c39057d59e5aa652a399) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3c3fc53376ce..6bff169fa8d4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2088,6 +2088,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;

9 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x f72383371e8c5d1d108532d7e395ff2c277233e5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070842-lugged-armband-abac@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: f72383371e8c ("drm/i915/display: For MTL+ platforms skip mg dp programming") 7fcf755896a3 ("drm/i915/display: use intel_encoder_is/to_* functions") 0a099232d254 ("drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state()") 684a37a6ffa9 ("drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active()") 65ea19a698f2 ("drm/i915/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin()") 6a8c66bf0e56 ("drm/i915: Don't explode when the dig port we don't have an AUX CH") d5c7854b50e6 ("drm/i915/xe2lpd: Move D2D enable/disable") 2e4b90fbe755 ("drm/i915: Filter out glitches on HPD lines during hotplug detection") 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") 00076671a648 ("drm/i915/display: Move colorimetry_support from intel_psr to intel_dp") e11300a1d8e3 ("drm/i915/display: Remove intel_crtc_state->psr_vsc") 561322c3bc14 ("drm/i915/display: Skip state verification with TBT-ALT mode") 7966a93a27cf ("drm/i915: Push audio enable/disable further out") 59be90248b42 ("drm/i915/mtl: C20 state verification") 3257e55d3ea7 ("drm/i915/panelreplay: enable/disable panel replay") b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") dd8f2298e34b ("drm/i915/psr: Move psr specific dpcd init into own function") 36f579ffc692 ("drm/i915/dp_mst: Improve BW sharing between MST streams") e37137380931 ("drm/i915/dp_mst: Force modeset CRTC if DSC toggling requires it") b2608c6b3212 ("drm/i915/dp_mst: Enable MST DSC decompression for all streams") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f72383371e8c5d1d108532d7e395ff2c277233e5 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Tue, 25 Jun 2024 14:18:40 +0300 Subject: [PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming 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(a)vger.kernel.org Signed-off-by: Mika Kahola <mika.kahola(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.… (cherry picked from commit aaf9dc86bd806458f848c39057d59e5aa652a399) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3c3fc53376ce..6bff169fa8d4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2088,6 +2088,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;

9 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x f72383371e8c5d1d108532d7e395ff2c277233e5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070841-tanning-polka-a370@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: f72383371e8c ("drm/i915/display: For MTL+ platforms skip mg dp programming") 7fcf755896a3 ("drm/i915/display: use intel_encoder_is/to_* functions") 0a099232d254 ("drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state()") 684a37a6ffa9 ("drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active()") 65ea19a698f2 ("drm/i915/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin()") 6a8c66bf0e56 ("drm/i915: Don't explode when the dig port we don't have an AUX CH") d5c7854b50e6 ("drm/i915/xe2lpd: Move D2D enable/disable") 2e4b90fbe755 ("drm/i915: Filter out glitches on HPD lines during hotplug detection") 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") 00076671a648 ("drm/i915/display: Move colorimetry_support from intel_psr to intel_dp") e11300a1d8e3 ("drm/i915/display: Remove intel_crtc_state->psr_vsc") 561322c3bc14 ("drm/i915/display: Skip state verification with TBT-ALT mode") 7966a93a27cf ("drm/i915: Push audio enable/disable further out") 59be90248b42 ("drm/i915/mtl: C20 state verification") 3257e55d3ea7 ("drm/i915/panelreplay: enable/disable panel replay") b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") dd8f2298e34b ("drm/i915/psr: Move psr specific dpcd init into own function") 36f579ffc692 ("drm/i915/dp_mst: Improve BW sharing between MST streams") e37137380931 ("drm/i915/dp_mst: Force modeset CRTC if DSC toggling requires it") b2608c6b3212 ("drm/i915/dp_mst: Enable MST DSC decompression for all streams") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f72383371e8c5d1d108532d7e395ff2c277233e5 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Tue, 25 Jun 2024 14:18:40 +0300 Subject: [PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming 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(a)vger.kernel.org Signed-off-by: Mika Kahola <mika.kahola(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.… (cherry picked from commit aaf9dc86bd806458f848c39057d59e5aa652a399) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3c3fc53376ce..6bff169fa8d4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2088,6 +2088,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;

9 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming" failed to apply to 6.6-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x f72383371e8c5d1d108532d7e395ff2c277233e5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070840-gurgle-wikipedia-e4e0@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: f72383371e8c ("drm/i915/display: For MTL+ platforms skip mg dp programming") 7fcf755896a3 ("drm/i915/display: use intel_encoder_is/to_* functions") 0a099232d254 ("drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state()") 684a37a6ffa9 ("drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active()") 65ea19a698f2 ("drm/i915/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin()") 6a8c66bf0e56 ("drm/i915: Don't explode when the dig port we don't have an AUX CH") d5c7854b50e6 ("drm/i915/xe2lpd: Move D2D enable/disable") 2e4b90fbe755 ("drm/i915: Filter out glitches on HPD lines during hotplug detection") 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") 00076671a648 ("drm/i915/display: Move colorimetry_support from intel_psr to intel_dp") e11300a1d8e3 ("drm/i915/display: Remove intel_crtc_state->psr_vsc") 561322c3bc14 ("drm/i915/display: Skip state verification with TBT-ALT mode") 7966a93a27cf ("drm/i915: Push audio enable/disable further out") 59be90248b42 ("drm/i915/mtl: C20 state verification") 3257e55d3ea7 ("drm/i915/panelreplay: enable/disable panel replay") b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") dd8f2298e34b ("drm/i915/psr: Move psr specific dpcd init into own function") 36f579ffc692 ("drm/i915/dp_mst: Improve BW sharing between MST streams") e37137380931 ("drm/i915/dp_mst: Force modeset CRTC if DSC toggling requires it") b2608c6b3212 ("drm/i915/dp_mst: Enable MST DSC decompression for all streams") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f72383371e8c5d1d108532d7e395ff2c277233e5 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Tue, 25 Jun 2024 14:18:40 +0300 Subject: [PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming 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(a)vger.kernel.org Signed-off-by: Mika Kahola <mika.kahola(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.… (cherry picked from commit aaf9dc86bd806458f848c39057d59e5aa652a399) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3c3fc53376ce..6bff169fa8d4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2088,6 +2088,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;

9 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x f72383371e8c5d1d108532d7e395ff2c277233e5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070840-unworn-partly-35f5@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: f72383371e8c ("drm/i915/display: For MTL+ platforms skip mg dp programming") 7fcf755896a3 ("drm/i915/display: use intel_encoder_is/to_* functions") 0a099232d254 ("drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state()") 684a37a6ffa9 ("drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active()") 65ea19a698f2 ("drm/i915/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin()") 6a8c66bf0e56 ("drm/i915: Don't explode when the dig port we don't have an AUX CH") d5c7854b50e6 ("drm/i915/xe2lpd: Move D2D enable/disable") 2e4b90fbe755 ("drm/i915: Filter out glitches on HPD lines during hotplug detection") 31a5b6ed88c7 ("drm/i915/display: Unify VSC SPD preparation") 00076671a648 ("drm/i915/display: Move colorimetry_support from intel_psr to intel_dp") e11300a1d8e3 ("drm/i915/display: Remove intel_crtc_state->psr_vsc") 561322c3bc14 ("drm/i915/display: Skip state verification with TBT-ALT mode") 7966a93a27cf ("drm/i915: Push audio enable/disable further out") 59be90248b42 ("drm/i915/mtl: C20 state verification") 3257e55d3ea7 ("drm/i915/panelreplay: enable/disable panel replay") b8cf5b5d266e ("drm/i915/panelreplay: Initializaton and compute config for panel replay") dd8f2298e34b ("drm/i915/psr: Move psr specific dpcd init into own function") 36f579ffc692 ("drm/i915/dp_mst: Improve BW sharing between MST streams") e37137380931 ("drm/i915/dp_mst: Force modeset CRTC if DSC toggling requires it") b2608c6b3212 ("drm/i915/dp_mst: Enable MST DSC decompression for all streams") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f72383371e8c5d1d108532d7e395ff2c277233e5 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Tue, 25 Jun 2024 14:18:40 +0300 Subject: [PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming 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(a)vger.kernel.org Signed-off-by: Mika Kahola <mika.kahola(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.… (cherry picked from commit aaf9dc86bd806458f848c39057d59e5aa652a399) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3c3fc53376ce..6bff169fa8d4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2088,6 +2088,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;

9 months, 3 weeks

1
0
0 0

FAILED: patch "[PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming" failed to apply to 6.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.9.y git checkout FETCH_HEAD git cherry-pick -x f72383371e8c5d1d108532d7e395ff2c277233e5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070839-undertake-variably-bedc@gregkh' --subject-prefix 'PATCH 6.9.y' HEAD^.. Possible dependencies: f72383371e8c ("drm/i915/display: For MTL+ platforms skip mg dp programming") 7fcf755896a3 ("drm/i915/display: use intel_encoder_is/to_* functions") 0a099232d254 ("drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state()") 684a37a6ffa9 ("drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active()") 65ea19a698f2 ("drm/i915/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f72383371e8c5d1d108532d7e395ff2c277233e5 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak(a)intel.com> Date: Tue, 25 Jun 2024 14:18:40 +0300 Subject: [PATCH] drm/i915/display: For MTL+ platforms skip mg dp programming 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(a)vger.kernel.org Signed-off-by: Mika Kahola <mika.kahola(a)intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240625111840.597574-1-mika.… (cherry picked from commit aaf9dc86bd806458f848c39057d59e5aa652a399) Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3c3fc53376ce..6bff169fa8d4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2088,6 +2088,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;

9 months, 3 weeks

1
0
0 0

[PATCH 4.19] Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt

by Wentao Guan

From: Jaganath Kanakkassery <jaganath.k.os(a)gmail.com> Please apply the upstream commit: commit cd9151b618da ("Bluetooth: Fix incorrect pointer arithmatic in ext_adv_report_evt") Solved kernel BT Err "Bluetooth: Unknown advertising packet type: 0x100" ------------------------------------------------------------------------- In ext_adv_report_event rssi comes before data (not after data as in legacy adv_report_evt) so "+ 1" is not required in the ptr arithmatic to point to next report. Cc: stable(a)vger.kernel.org # 4.19- Signed-off-by: Jaganath Kanakkassery <jaganath.kanakkassery(a)intel.com> Signed-off-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Wentao Guan <guanwentao(a)uniontech.com> --- net/bluetooth/hci_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 3e7badb3ac2d..4f972c9e9dbe 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5402,7 +5402,7 @@ static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb) ev->data, ev->length); } - ptr += sizeof(*ev) + ev->length + 1; + ptr += sizeof(*ev) + ev->length; } hci_dev_unlock(hdev); -- 2.20.1

9 months, 3 weeks

2
1
0 0

[PATCH AUTOSEL 6.6 01/18] nvme-multipath: find NUMA path only for online numa-node

by Sasha Levin

From: Nilay Shroff <nilay(a)linux.ibm.com> [ Upstream commit d3a043733f25d743f3aa617c7f82dbcb5ee2211a ] In current native multipath design when a shared namespace is created, we loop through each possible numa-node, calculate the NUMA distance of that node from each nvme controller and then cache the optimal IO path for future reference while sending IO. The issue with this design is that we may refer to the NUMA distance table for an offline node which may not be populated at the time and so we may inadvertently end up finding and caching a non-optimal path for IO. Then latter when the corresponding numa-node becomes online and hence the NUMA distance table entry for that node is created, ideally we should re-calculate the multipath node distance for the newly added node however that doesn't happen unless we rescan/reset the controller. So essentially, we may keep using non-optimal IO path for a node which is made online after namespace is created. This patch helps fix this issue ensuring that when a shared namespace is created, we calculate the multipath node distance for each online numa-node instead of each possible numa-node. Then latter when a node becomes online and we receive any IO on that newly added node, we would calculate the multipath node distance for newly added node but this time NUMA distance table would have been already populated for newly added node. Hence we would be able to correctly calculate the multipath node distance and choose the optimal path for the IO. Signed-off-by: Nilay Shroff <nilay(a)linux.ibm.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Keith Busch <kbusch(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/nvme/host/multipath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 0a88d7bdc5e37..6a444ce273366 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -592,7 +592,7 @@ static void nvme_mpath_set_live(struct nvme_ns *ns) int node, srcu_idx; srcu_idx = srcu_read_lock(&head->srcu); - for_each_node(node) + for_each_online_node(node) __nvme_find_path(head, node); srcu_read_unlock(&head->srcu, srcu_idx); } -- 2.43.0

9 months, 3 weeks

2
20
0 0

FAILED: patch "[PATCH] tpm: Address !chip->auth in tpm2_*_auth_session()" failed to apply to 6.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.9.y git checkout FETCH_HEAD git cherry-pick -x 25ee48a55fd59c72e0bd46dd9160c2d406b5a497 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024070848-graveness-probiotic-9eb0@gregkh' --subject-prefix 'PATCH 6.9.y' HEAD^.. Possible dependencies: 25ee48a55fd5 ("tpm: Address !chip->auth in tpm2_*_auth_session()") eb24c9788cd9 ("tpm: disable the TPM if NULL name changes") d0a25bb961e6 ("tpm: Add HMAC session name/handle append") 699e3efd6c64 ("tpm: Add HMAC session start and end functions") 033ee84e5f01 ("tpm: Add TCG mandated Key Derivation Functions (KDFs)") d2add27cf2b8 ("tpm: Add NULL primary creation") 17d89b2e2f76 ("tpm: Move buffer handling from static inlines to real functions") cf792e903aff ("tpm: Remove unused tpm_buf_tag()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 25ee48a55fd59c72e0bd46dd9160c2d406b5a497 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen <jarkko(a)kernel.org> Date: Wed, 3 Jul 2024 19:39:27 +0300 Subject: [PATCH] tpm: Address !chip->auth in tpm2_*_auth_session() Unless tpm_chip_bootstrap() was called by the driver, !chip->auth can cause a null derefence in tpm2_*_auth_session(). Thus, address !chip->auth in tpm2_*_auth_session(). Cc: stable(a)vger.kernel.org # v6.9+ Reported-by: Stefan Berger <stefanb(a)linux.ibm.com> Closes: https://lore.kernel.org/linux-integrity/20240617193408.1234365-1-stefanb@li… Fixes: 699e3efd6c64 ("tpm: Add HMAC session start and end functions") Tested-by: Michael Ellerman <mpe(a)ellerman.id.au> # ppc Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org> diff --git a/drivers/char/tpm/tpm2-sessions.c b/drivers/char/tpm/tpm2-sessions.c index 907ac9956a78..2f1d96a5a5a7 100644 --- a/drivers/char/tpm/tpm2-sessions.c +++ b/drivers/char/tpm/tpm2-sessions.c @@ -824,8 +824,13 @@ EXPORT_SYMBOL(tpm_buf_check_hmac_response); */ void tpm2_end_auth_session(struct tpm_chip *chip) { - tpm2_flush_context(chip, chip->auth->handle); - memzero_explicit(chip->auth, sizeof(*chip->auth)); + struct tpm2_auth *auth = chip->auth; + + if (!auth) + return; + + tpm2_flush_context(chip, auth->handle); + memzero_explicit(auth, sizeof(*auth)); } EXPORT_SYMBOL(tpm2_end_auth_session); @@ -907,6 +912,11 @@ int tpm2_start_auth_session(struct tpm_chip *chip) int rc; u32 null_key; + if (!auth) { + dev_warn_once(&chip->dev, "auth session is not active\n"); + return 0; + } + rc = tpm2_load_null(chip, &null_key); if (rc) goto out;

9 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2024