drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11,5
Subsystems (3)
PATCH v3 1/1 drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11,5
On dual-GPU Retina MacBooks the internal panel is muxed to the discrete GPU at boot, so Apple's firmware never lights up eDP on the Intel side. As a result it never sets DDI_A_4_LANES, and intel_ddi_max_lanes() reads back a source maximum of two lanes for port A.
intel_dp_max_common_lane_count() then takes min3(source_max = 2, sink_max = 4, ...) = 2, giving 2 x 2.7 Gbps x 8/10 = 4.32 Gbps of link bandwidth. The panel's native 2880x1800@60 8bpc mode needs 8.1 Gbps, so every mode is rejected with MODE_CLOCK_HIGH and the connector comes up with no usable modes at all -- the panel stays dark whenever i915 is made to drive it, which looks like a hardware limitation but is not.
The lanes are physically there. Reading the panel's DPCD from the AMD side, where amdgpu drives it correctly, reports MAX_LANE_COUNT = 0x84, i.e. 4 lanes, and amdgpu's own link_settings shows it running the panel at 4 lanes / HBR. macOS likewise drives this panel from the iGPU at its native resolution, so all four lanes are routed through the gmux to DDI A. Only the register bit is unset.
intel_ddi_a_force_4_lanes() already exists for exactly this situation -- its neighbouring comment notes that "Some BIOS might fail to set this bit on port A if eDP wasn't lit up at boot" -- but it only covers Broxton and Geminilake. Extend it with a DMI quirk so affected Macs get the correct lane count too.
The DMI match is deliberately narrow. Other dual-GPU models in the same family are very likely affected identically, but they are untested, so widen the match only as reports come in.
Tested on a MacBookPro11,5 (Haswell Crystal Well, Iris Pro 5200 + Radeon R9 M370X): with the quirk, DDI A comes up as 4 lanes, link training passes at link rate 270000 / lane count 4, and i915 drives the internal panel at its native 2880x1800.
---
Numbering note: neither earlier posting was labelled, so to match the numbering already used on the list this is v3. v1 [1] was pasted into a mail client by hand, which hard-wrapped the diff and detabbed it, leaving it unapplicable. v2 [2] was the same patch resent with git send-email, unlabelled.
v3:
- No functional change since v2.
- Commit message: the machine is Haswell (Crystal Well), not Broadwell as v1/v2 claimed. The DMI match was always by model, so no code change.
- Added Closes: tag for the bug report, which carries the failing-case logs, the VBT dump and the EDID.
[1] https://lore.kernel.org/r/CANFnrspHiK7ii28XPdLkOMyhSZcJ9xz6CT-kNX+oiiF+8N-2Fg@mail.gmail.com
[2] https://lore.kernel.org/lkml/[email protected]/
drivers/gpu/drm/i915/display/intel_ddi.c | 7 +++++ drivers/gpu/drm/i915/display/intel_quirks.c | 34 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_quirks.h | 1 + 3 files changed, 42 insertions(+)
drivers/gpu/drm/i915/display/intel_ddi.c +7 -0
@@ -4976,6 +4976,13 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)if (display->platform.geminilake || display->platform.broxton)return true; +/* +* Machines whose firmware leaves eDP dark on the Intel side never set +* the bit, so trust the quirk rather than the register. +*/ +if (intel_has_quirk (display,QUIRK_DDI_A_FORCE_4_LANES )) +return true; +return false; }
drivers/gpu/drm/i915/display/intel_quirks.c +34 -0
@@ -100,6 +100,20 @@ static void quirk_disable_psr2(struct intel_display *display)drm_info (display->drm,"PSR2 support not currently available for this setup, applying disable PSR2 quirk\n" ); } +/* +* Dual-GPU Macs boot with the internal panel muxed to the discrete GPU, so +* the firmware never lights up eDP on the Intel side and consequently never +* sets DDI_A_4_LANES -- even though all four lanes are wired through the gmux +* to DDI A. Without the bit, port A is capped at two lanes, which is not +* enough bandwidth for the panel's native mode, leaving the connector with no +* usable modes at all. +*/ +static void quirk_ddi_a_force_4_lanes (struct intel_display *display) +{ +intel_set_quirk (display,QUIRK_DDI_A_FORCE_4_LANES ); +drm_info (display->drm,"Applying DDI A force 4 lanes quirk\n" ); +} +struct intel_quirk {int device;int subsystem_vendor;
@@ -142,6 +156,13 @@ static int intel_dmi_no_pps_backlight(const struct dmi_system_id *id)return 1 ; } +static int intel_dmi_ddi_a_force_4_lanes (const struct dmi_system_id *id) +{ +DRM_INFO ("DDI A is 4 lanes despite firmware on %s\n" , id->ident); + +return 1 ; +} +static const struct intel_dmi_quirk intel_dmi_quirks[] = { { .dmi_id_list = &(const struct dmi_system_id []) {
@@ -188,6 +209,19 @@ static const struct intel_dmi_quirk intel_dmi_quirks[] = { }, .hook = quirk_no_pps_backlight_power_hook, }, + { + .dmi_id_list = &(const struct dmi_system_id[]) { + { + .callback = intel_dmi_ddi_a_force_4_lanes, + .ident ="Apple MacBookPro11,5" , + .matches = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Apple Inc." ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"MacBookPro11,5" ), + }, + }, + { } + }, + .hook = quirk_ddi_a_force_4_lanes, + }, }; static struct intel_quirk intel_quirks[] = {
drivers/gpu/drm/i915/display/intel_quirks.h +1 -0
@@ -23,6 +23,7 @@ enum intel_quirk_id {QUIRK_EDP_LIMIT_RATE_HBR2 ,QUIRK_DISABLE_EDP_PANEL_REPLAY ,QUIRK_DISABLE_PSR2 , + QUIRK_DDI_A_FORCE_4_LANES, };void intel_init_quirks (struct intel_display *display);
base-commit: 50d05c7c76c96b90462f24debacca971d2e86713
Signature · 1 line
2.55.0
Patchwork
CI✗ LGCI.VerificationFailed: failure for drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 (rev3)
URL : https://patchwork.freedesktop.org/series/173998/
State : failure
== Summary ==
Series author address '[email protected]' is not on the allowlist, which prevents CI from being automatically triggered. If you want CI to run for this series, ask Patchwork project owners to click 'retest' on the series in Patchwork. Exception occurred during validation, bailing out!
Build URL: http://intel-gfx-ci-public.igk.intel.com:8080/job/xe_pw_trigger/1284208/ (on master)
Patchwork
CI✗ LGCI.VerificationFailed: failure for drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 (rev4)
In reply to Theo Andersen Carton== Series Details ==
== Series Details ==
Series: drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 (rev4)
URL : https://patchwork.freedesktop.org/series/174000/
State : failure
== Summary ==
Series author address '[email protected]' is not on the allowlist, which prevents CI from being automatically triggered. If you want CI to run for this series, ask Patchwork project owners to click 'retest' on the series in Patchwork. Exception occurred during validation, bailing out!
Build URL: http://gfx-ci.igk.intel.com:8080/job/CI_PW_kernel/187719/ (on built-in)
Hi Jani,
Gentle ping on v3. Patchwork says CI won't trigger automatically because my address isn't on the allowlist:
https://patchwork.freedesktop.org/series/174000/
Could someone with access click retest on rev4? For reference, BAT on the earlier identical posting (rev3) passed. The shard failures from that run were on MTL and DG1, which never reach this code since the quirk is gated on a DMI match for MacBookPro11,5.
The bug with the logs and the VBT dump is still at
https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17087
Thanks,
Theo
Den tors. 17. sep. 2026 kl. 20.52 skrev Theo Andersen Carton <[email protected]>:
Quoted 152 lines
On dual-GPU Retina MacBooks the internal panel is muxed to the discrete GPU at boot, so Apple's firmware never lights up eDP on the Intel side. As a result it never sets
DDI_A_4_LANES, andintel_ddi_max_lanes()reads back a source maximum of two lanes for port A.
intel_dp_max_common_lane_count()then takesmin3(source_max = 2, sink_max = 4, ...)= 2, giving 2 x 2.7 Gbps x 8/10 = 4.32 Gbps of link bandwidth. The panel's native 2880x1800@60 8bpc mode needs 8.1 Gbps, so every mode is rejected withMODE_CLOCK_HIGHand the connector comes up with no usable modes at all -- the panel stays dark whenever i915 is made to drive it, which looks like a hardware limitation but is not.The lanes are physically there. Reading the panel's DPCD from the AMD side, where amdgpu drives it correctly, reports
MAX_LANE_COUNT=0x84, i.e. 4 lanes, and amdgpu's ownlink_settingsshows it running the panel at 4 lanes / HBR. macOS likewise drives this panel from the iGPU at its native resolution, so all four lanes are routed through the gmux to DDI A. Only the register bit is unset.
intel_ddi_a_force_4_lanes()already exists for exactly this situation -- its neighbouring comment notes that "Some BIOS might fail to set this bit on port A if eDP wasn't lit up at boot" -- but it only covers Broxton and Geminilake. Extend it with a DMI quirk so affected Macs get the correct lane count too.The DMI match is deliberately narrow. Other dual-GPU models in the same family are very likely affected identically, but they are untested, so widen the match only as reports come in.
Tested on a MacBookPro11,5 (Haswell Crystal Well, Iris Pro 5200 + Radeon R9 M370X): with the quirk, DDI A comes up as 4 lanes, link training passes at link rate 270000 / lane count 4, and i915 drives the internal panel at its native 2880x1800.
Signed-off-by Theo Andersen Carton <[email protected]>---
Numbering note: neither earlier posting was labelled, so to match the numbering already used on the list this is v3. v1 [1] was pasted into a mail client by hand, which hard-wrapped the diff and detabbed it, leaving it unapplicable. v2 [2] was the same patch resent with git send-email, unlabelled.v3:
- No functional change since v2.
- Commit message: the machine is Haswell (Crystal Well), not Broadwell as v1/v2 claimed. The DMI match was always by model, so no code change.
- Added Closes: tag for the bug report, which carries the failing-case logs, the VBT dump and the EDID.[1] https://lore.kernel.org/r/CANFnrspHiK7ii28XPdLkOMyhSZcJ9xz6CT-kNX+oiiF+8N-2Fg@mail.gmail.com
[2] https://lore.kernel.org/lkml/[email protected]/drivers/gpu/drm/i915/display/intel_ddi.c | 7 +++++ drivers/gpu/drm/i915/display/intel_quirks.c | 34 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_quirks.h | 1 + 3 files changed, 42 insertions(+)drivers/gpu/drm/i915/display/intel_ddi.c +7
-0@@ -4976,6 +4976,13 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)if (display->platform.geminilake || display->platform.broxton)return true; +/* +* Machines whose firmware leaves eDP dark on the Intel side never set +* the bit, so trust the quirk rather than the register. +*/ +if (intel_has_quirk (display,QUIRK_DDI_A_FORCE_4_LANES )) +return true; +return false; }drivers/gpu/drm/i915/display/intel_quirks.c +34
-0@@ -100,6 +100,20 @@ static void quirk_disable_psr2(struct intel_display *display)drm_info (display->drm,"PSR2 support not currently available for this setup, applying disable PSR2 quirk\n" ); } +/* +* Dual-GPU Macs boot with the internal panel muxed to the discrete GPU, so +* the firmware never lights up eDP on the Intel side and consequently never +* sets DDI_A_4_LANES -- even though all four lanes are wired through the gmux +* to DDI A. Without the bit, port A is capped at two lanes, which is not +* enough bandwidth for the panel's native mode, leaving the connector with no +* usable modes at all. +*/ +static void quirk_ddi_a_force_4_lanes (struct intel_display *display) +{ +intel_set_quirk (display,QUIRK_DDI_A_FORCE_4_LANES ); +drm_info (display->drm,"Applying DDI A force 4 lanes quirk\n" ); +} +struct intel_quirk {int device;int subsystem_vendor;@@ -142,6 +156,13 @@ static int intel_dmi_no_pps_backlight(const struct dmi_system_id *id)return 1 ; } +static int intel_dmi_ddi_a_force_4_lanes (const struct dmi_system_id *id) +{ +DRM_INFO ("DDI A is 4 lanes despite firmware on %s\n" , id->ident); + +return 1 ; +} +static const struct intel_dmi_quirk intel_dmi_quirks[] = { { .dmi_id_list = &(const struct dmi_system_id []) {@@ -188,6 +209,19 @@ static const struct intel_dmi_quirk intel_dmi_quirks[] = { }, .hook = quirk_no_pps_backlight_power_hook, }, + { + .dmi_id_list = &(const struct dmi_system_id[]) { + { + .callback = intel_dmi_ddi_a_force_4_lanes, + .ident ="Apple MacBookPro11,5" , + .matches = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Apple Inc." ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"MacBookPro11,5" ), + }, + }, + { } + }, + .hook = quirk_ddi_a_force_4_lanes, + }, }; static struct intel_quirk intel_quirks[] = {drivers/gpu/drm/i915/display/intel_quirks.h +1
-0@@ -23,6 +23,7 @@ enum intel_quirk_id {QUIRK_EDP_LIMIT_RATE_HBR2 ,QUIRK_DISABLE_EDP_PANEL_REPLAY ,QUIRK_DISABLE_PSR2 , + QUIRK_DDI_A_FORCE_4_LANES, };void intel_init_quirks (struct intel_display *display);base-commit:
50d05c7c76c96b90462f24debacca971d2e86713--
2.55.0
Quoted 29 lines · Theo Andersen Carton
On dual-GPU Retina MacBooks the internal panel is muxed to the discrete GPU at boot, so Apple's firmware never lights up eDP on the Intel side. As a result it never sets
DDI_A_4_LANES, andintel_ddi_max_lanes()reads back a source maximum of two lanes for port A.
intel_dp_max_common_lane_count()then takesmin3(source_max = 2, sink_max = 4, ...)= 2, giving 2 x 2.7 Gbps x 8/10 = 4.32 Gbps of link bandwidth. The panel's native 2880x1800@60 8bpc mode needs 8.1 Gbps, so every mode is rejected withMODE_CLOCK_HIGHand the connector comes up with no usable modes at all -- the panel stays dark whenever i915 is made to drive it, which looks like a hardware limitation but is not.The lanes are physically there. Reading the panel's DPCD from the AMD side, where amdgpu drives it correctly, reports
MAX_LANE_COUNT=0x84, i.e. 4 lanes, and amdgpu's ownlink_settingsshows it running the panel at 4 lanes / HBR. macOS likewise drives this panel from the iGPU at its native resolution, so all four lanes are routed through the gmux to DDI A. Only the register bit is unset.
intel_ddi_a_force_4_lanes()already exists for exactly this situation -- its neighbouring comment notes that "Some BIOS might fail to set this bit on port A if eDP wasn't lit up at boot" -- but it only covers Broxton and Geminilake. Extend it with a DMI quirk so affected Macs get the correct lane count too.The DMI match is deliberately narrow. Other dual-GPU models in the same family are very likely affected identically, but they are untested, so widen the match only as reports come in.
Quoted 7 lines
Tested on a MacBookPro11,5 (Haswell Crystal Well, Iris Pro 5200 + Radeon R9 M370X): with the quirk, DDI A comes up as 4 lanes, link training passes at link rate 270000 / lane count 4, and i915 drives the internal panel at its native 2880x1800.
Sorry, this fell through the cracks. It looks good to me, but I kicked the CI to run. We don't actually have Macs in CI, but it's more to ensure we're not regressing anything.
Quoted 112 lines
---
Numbering note: neither earlier posting was labelled, so to match the numbering already used on the list this is v3. v1 [1] was pasted into a mail client by hand, which hard-wrapped the diff and detabbed it, leaving it unapplicable. v2 [2] was the same patch resent with git send-email, unlabelled.v3:
- No functional change since v2.
- Commit message: the machine is Haswell (Crystal Well), not Broadwell as v1/v2 claimed. The DMI match was always by model, so no code change.
- Added Closes: tag for the bug report, which carries the failing-case logs, the VBT dump and the EDID.[1] https://lore.kernel.org/r/CANFnrspHiK7ii28XPdLkOMyhSZcJ9xz6CT-kNX+oiiF+8N-2Fg@mail.gmail.com
[2] https://lore.kernel.org/lkml/[email protected]/drivers/gpu/drm/i915/display/intel_ddi.c | 7 +++++ drivers/gpu/drm/i915/display/intel_quirks.c | 34 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_quirks.h | 1 + 3 files changed, 42 insertions(+)drivers/gpu/drm/i915/display/intel_ddi.c +7
-0@@ -4976,6 +4976,13 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)if (display->platform.geminilake || display->platform.broxton)return true; +/* +* Machines whose firmware leaves eDP dark on the Intel side never set +* the bit, so trust the quirk rather than the register. +*/ +if (intel_has_quirk (display,QUIRK_DDI_A_FORCE_4_LANES )) +return true; +return false; }drivers/gpu/drm/i915/display/intel_quirks.c +34
-0@@ -100,6 +100,20 @@ static void quirk_disable_psr2(struct intel_display *display)drm_info (display->drm,"PSR2 support not currently available for this setup, applying disable PSR2 quirk\n" ); } +/* +* Dual-GPU Macs boot with the internal panel muxed to the discrete GPU, so +* the firmware never lights up eDP on the Intel side and consequently never +* sets DDI_A_4_LANES -- even though all four lanes are wired through the gmux +* to DDI A. Without the bit, port A is capped at two lanes, which is not +* enough bandwidth for the panel's native mode, leaving the connector with no +* usable modes at all. +*/ +static void quirk_ddi_a_force_4_lanes (struct intel_display *display) +{ +intel_set_quirk (display,QUIRK_DDI_A_FORCE_4_LANES ); +drm_info (display->drm,"Applying DDI A force 4 lanes quirk\n" ); +} +struct intel_quirk {int device;int subsystem_vendor;@@ -142,6 +156,13 @@ static int intel_dmi_no_pps_backlight(const struct dmi_system_id *id)return 1 ; } +static int intel_dmi_ddi_a_force_4_lanes (const struct dmi_system_id *id) +{ +DRM_INFO ("DDI A is 4 lanes despite firmware on %s\n" , id->ident); + +return 1 ; +} +static const struct intel_dmi_quirk intel_dmi_quirks[] = { { .dmi_id_list = &(const struct dmi_system_id []) {@@ -188,6 +209,19 @@ static const struct intel_dmi_quirk intel_dmi_quirks[] = { }, .hook = quirk_no_pps_backlight_power_hook, }, + { + .dmi_id_list = &(const struct dmi_system_id[]) { + { + .callback = intel_dmi_ddi_a_force_4_lanes, + .ident ="Apple MacBookPro11,5" , + .matches = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Apple Inc." ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"MacBookPro11,5" ), + }, + }, + { } + }, + .hook = quirk_ddi_a_force_4_lanes, + }, }; static struct intel_quirk intel_quirks[] = {drivers/gpu/drm/i915/display/intel_quirks.h +1
-0@@ -23,6 +23,7 @@ enum intel_quirk_id {QUIRK_EDP_LIMIT_RATE_HBR2 ,QUIRK_DISABLE_EDP_PANEL_REPLAY ,QUIRK_DISABLE_PSR2 , + QUIRK_DDI_A_FORCE_4_LANES, };void intel_init_quirks (struct intel_display *display);base-commit:
50d05c7c76c96b90462f24debacca971d2e86713
Signature · 1 line
Jani Nikula, Intel
Patchwork
CI✗ Fi.CI.BUILD: failure for drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 (rev5)
In reply to Theo Andersen Carton== Series Details ==
== Series Details ==
Series: drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 (rev5)
URL : https://patchwork.freedesktop.org/series/174000/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/174000/revisions/5/mbox/ not applied
Applying: drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_ddi.c
M drivers/gpu/drm/i915/display/intel_quirks.c
M drivers/gpu/drm/i915/display/intel_quirks.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_quirks.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_quirks.h Auto-merging drivers/gpu/drm/i915/display/intel_quirks.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_quirks.c Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/ddi: add DDI A force 4 lanes quirk for Apple MacBookPro11, 5 When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced