Skip to content

Commit 9520b1d

Browse files
committed
Merge tag 'drm-intel-fixes-2022-10-27-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
- Extend Wa_1607297627 to Alderlake-P (José Roberto de Souza) - Keep PCI autosuspend control 'on' by default on all dGPU (Anshuman Gupta) - Reset frl trained flag before restarting FRL training (Ankit Nautiyal) Signed-off-by: Dave Airlie <[email protected]> From: Tvrtko Ursulin <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/Y1o+teE2Z11pT1MN@tursulin-desk
2 parents 200ec44 + 63720a5 commit 9520b1d

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

drivers/gpu/drm/i915/display/intel_dp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3957,6 +3957,8 @@ intel_dp_handle_hdmi_link_status_change(struct intel_dp *intel_dp)
39573957

39583958
drm_dp_pcon_hdmi_frl_link_error_count(&intel_dp->aux, &intel_dp->attached_connector->base);
39593959

3960+
intel_dp->frl.is_trained = false;
3961+
39603962
/* Restart FRL training or fall back to TMDS mode */
39613963
intel_dp_check_frl_training(intel_dp);
39623964
}

drivers/gpu/drm/i915/gt/intel_workarounds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,11 +2293,11 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
22932293
}
22942294

22952295
if (IS_DG1_GRAPHICS_STEP(i915, STEP_A0, STEP_B0) ||
2296-
IS_ROCKETLAKE(i915) || IS_TIGERLAKE(i915)) {
2296+
IS_ROCKETLAKE(i915) || IS_TIGERLAKE(i915) || IS_ALDERLAKE_P(i915)) {
22972297
/*
22982298
* Wa_1607030317:tgl
22992299
* Wa_1607186500:tgl
2300-
* Wa_1607297627:tgl,rkl,dg1[a0]
2300+
* Wa_1607297627:tgl,rkl,dg1[a0],adlp
23012301
*
23022302
* On TGL and RKL there are multiple entries for this WA in the
23032303
* BSpec; some indicate this is an A0-only WA, others indicate

drivers/gpu/drm/i915/intel_runtime_pm.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,15 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
591591
pm_runtime_use_autosuspend(kdev);
592592
}
593593

594-
/* Enable by default */
595-
pm_runtime_allow(kdev);
594+
/*
595+
* FIXME: Temp hammer to keep autosupend disable on lmem supported platforms.
596+
* As per PCIe specs 5.3.1.4.1, all iomem read write request over a PCIe
597+
* function will be unsupported in case PCIe endpoint function is in D3.
598+
* Let's keep i915 autosuspend control 'on' till we fix all known issue
599+
* with lmem access in D3.
600+
*/
601+
if (!IS_DGFX(i915))
602+
pm_runtime_allow(kdev);
596603

597604
/*
598605
* The core calls the driver load handler with an RPM reference held.

0 commit comments

Comments
 (0)