drm/i915/psr: Nuke PSR support for VLV and CHV
Subsystems (2)
RFC 1/1 drm/i915/psr: Nuke PSR support for VLV and CHV
1) PSR hardware and hence the driver code deviates a lot from the DDI implementations. Retaining support for VLV and CHV is maintenance burden, we've had to refactor to keep the code clean.
2) There is no PSR capable VLV/CHV platform in CI to ensure code is correct.
3) There are likely no users for PSR on CHV and VLV and the feature has been disabled for a while now.
4) There are still known issues that need to be fixed if we want to enable PSR on these platforms, I am not aware of anyone working on it.
--- drivers/gpu/drm/i915/i915_debugfs.c | 40 +---- drivers/gpu/drm/i915/i915_pci.c | 2 - drivers/gpu/drm/i915/intel_drv.h | 2 - drivers/gpu/drm/i915/intel_frontbuffer.c | 2 - drivers/gpu/drm/i915/intel_psr.c | 245 +++---------------------------- 5 files changed, 25 insertions(+), 266 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -36
@@ -2630,8 +2630,6 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 psrperf =0 ; -u32 stat[3 ]; -enum pipe pipe;bool enabled = false;bool sink_support;
@@ -2652,47 +2650,17 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev_priv)) { -if (dev_priv->psr.psr2_enabled) - enabled =I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ; -else - enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; - }else { -for_each_pipe (dev_priv, pipe) { -enum transcoder cpu_transcoder = -intel_pipe_to_cpu_transcoder (dev_priv, pipe); -enum intel_display_power_domain power_domain; - - power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder); -if (!intel_display_power_get_if_enabled (dev_priv, - power_domain)) -continue ; - - stat[pipe] =I915_READ (VLV_PSRSTAT (pipe)) & -VLV_EDP_PSR_CURR_STATE_MASK ; -if ((stat[pipe] ==VLV_EDP_PSR_ACTIVE_NORFB_UP ) || - (stat[pipe] ==VLV_EDP_PSR_ACTIVE_SF_UPDATE )) - enabled = true; - -intel_display_power_put (dev_priv, power_domain); - } - } +if (dev_priv->psr.psr2_enabled) + enabled =I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ; +else + enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ;seq_printf (m,"Main link in standby mode: %s\n" ,yesno (dev_priv->psr.link_standby));seq_printf (m,"HW Enabled & Active bit: %s" ,yesno (enabled)); -if (!HAS_DDI (dev_priv)) -for_each_pipe (dev_priv, pipe) { -if ((stat[pipe] ==VLV_EDP_PSR_ACTIVE_NORFB_UP ) || - (stat[pipe] ==VLV_EDP_PSR_ACTIVE_SF_UPDATE )) -seq_printf (m," pipe %c" ,pipe_name (pipe)); - } -seq_puts (m,"\n" ); -/* -* VLV/CHV PSR has no kind of performance counter * SKL+ Perf counter is reset to 0 everytime DC state is entered */ if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) {
drivers/gpu/drm/i915/i915_pci.c +0 -2
@@ -340,7 +340,6 @@ static const struct intel_device_info intel_valleyview_info = { GEN(7), .is_lp = 1, .num_pipes = 2, - .has_psr = 1, .has_runtime_pm = 1, .has_rc6 = 1, .has_gmch_display = 1,
@@ -433,7 +432,6 @@ static const struct intel_device_info intel_cherryview_info = { .is_lp = 1, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .has_64bit_reloc = 1, - .has_psr = 1, .has_runtime_pm = 1, .has_resource_streamer = 1, .has_rc6 = 1,
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -1912,8 +1912,6 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,unsigned frontbuffer_bits, enum fb_op_origin origin);void intel_psr_init (struct drm_i915_private *dev_priv); -void intel_psr_single_frame_update (struct drm_i915_private *dev_priv, -unsigned frontbuffer_bits);void intel_psr_compute_config (struct intel_dp *intel_dp,struct intel_crtc_state *crtc_state);void intel_psr_irq_control (struct drm_i915_private *dev_priv,bool debug);
drivers/gpu/drm/i915/intel_frontbuffer.c +0 -2
@@ -153,8 +153,6 @@ void intel_frontbuffer_flip_prepare(struct drm_i915_private *dev_priv,/* Remove stale busy bits due to the old buffer. */ dev_priv->fb_tracking.busy_bits &= ~frontbuffer_bits;spin_unlock (&dev_priv->fb_tracking.lock); - -intel_psr_single_frame_update (dev_priv, frontbuffer_bits); }/**
drivers/gpu/drm/i915/intel_psr.c +21 -224
330 lines not on this page · raw message
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/psr: Nuke PSR support for VLV and CHV
== Series Details ==
== Series Details ==
Series: drm/i915/psr: Nuke PSR support for VLV and CHV
URL : https://patchwork.freedesktop.org/series/42915/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4160 -> Patchwork_8955 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_8955 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_8955, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/42915/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8955:
=== IGT changes ===
==== Possible regressions ====
igt@kms_psr_sink_crc@psr_basic:
fi-kbl-r: PASS -> FAIL
fi-kbl-7560u: PASS -> FAIL
fi-cfl-s3: PASS -> FAIL
fi-cnl-y3: PASS -> FAIL
fi-cfl-u: PASS -> FAIL
fi-cnl-psr: PASS -> FAIL== Known issues ==
Here are the changes found in Patchwork_8955 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_psr_sink_crc@psr_basic:
fi-skl-6600u: PASS -> DMESG-FAIL (fdo#105537)
igt@kms_sink_crc_basic:
fi-cnl-psr: PASS -> FAIL (fdo#106378)
igt@pm_backlight@basic-brightness:
fi-skl-6600u: PASS -> DMESG-WARN (fdo#105537)
==== Possible fixes ====
igt@gem_exec_suspend@basic-s4-devices:
fi-kbl-7500u: DMESG-WARN (fdo#105128) -> PASS
igt@kms_chamelium@hdmi-hpd-fast:
fi-kbl-7500u: FAIL (fdo#102672, fdo#103841) -> SKIP
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
fi-glk-j4005: DMESG-WARN (fdo#106235) -> PASS +1
igt@pm_rpm@basic-pci-d3-state:
fi-glk-j4005: DMESG-WARN (fdo#106097) -> PASS
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: FAIL (fdo#104008) -> PASS fdo#102672 https://bugs.freedesktop.org/show_bug.cgi?id=102672
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#105537 https://bugs.freedesktop.org/show_bug.cgi?id=105537
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#106235 https://bugs.freedesktop.org/show_bug.cgi?id=106235
fdo#106378 https://bugs.freedesktop.org/show_bug.cgi?id=106378
== Participating hosts (41 -> 37) ==
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4160 -> Patchwork_8955
CI_DRM_4160: 6d9a2ccf9fca7c006f24b7ff6193ee356b6d3503 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4467: 548a894dc904c4628522dbbc77cb179a4c965ebc @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8955: 3e4dbf8238c429c489baac926807319d36b3c766 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4467: dd20daa579c816498f61e08c819117ad6eb4b4a5 @ git://anongit.freedesktop.org/piglit
== Linux commits ==
3e4dbf8238c4 drm/i915/psr: Nuke PSR support for VLV and CHV
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8955/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx