drm/i915: virtual PCH and PCH_NOP fixes
Subsystems (2)
Just a resend of [1] with Lucas' patch added.
BR,
Jani.
[1] http://mid.mail-archive.com/[email protected]
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/5 drm/i915: fix guest virtual PCH detection on non-PCH systems
Virtualized non-PCH systems such as Broxton or Geminilake should use PCH_NONE to indicate no PCH rather than PCH_NOP. The latter is a specific case to indicate a PCH system without south display.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -289,7 +289,7 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)if (WARN_ON (pch_type ==PCH_NONE )) pch_type =PCH_NOP ; }else { - pch_type =PCH_NOP ; + pch_type =PCH_NONE ; } dev_priv->pch_type = pch_type; dev_priv->pch_id = id;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915: document PCH_NOP
In reply to Jani NikulaFrom: Lucas De Marchi <[email protected]>
There's a difference between PCH_NONE and PCH_NOP: the former means we don't have a PCH while in the latter we do, but it doesn't have the south display.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -632,7 +632,7 @@ enum intel_pch {PCH_KBP ,/* Kaby Lake PCH */ PCH_CNP ,/* Cannon Lake PCH */ PCH_ICP ,/* Ice Lake PCH */ - PCH_NOP, + PCH_NOP, /* PCH without south display */ }; enum intel_sbi_destination {
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: clean up virtual PCH special case handling
In reply to Jani NikulaUse intel_pch_type() also for mapping the no PCH case (PCH id 0) to PCH_NONE to simplify code.
Also make sure that intel_pch_type() knows all the PCH ids returned by intel_virt_detect_pch(). Loudly fail if this isn't the case; this shouldn't happen anyway.
--- drivers/gpu/drm/i915/i915_drv.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +6 -7
@@ -284,13 +284,12 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) }else if (intel_is_virt_pch (id, pch->subsystem_vendor, pch->subsystem_device)) { id =intel_virt_detect_pch (dev_priv); -if (id) { - pch_type =intel_pch_type (dev_priv, id); -if (WARN_ON (pch_type ==PCH_NONE )) - pch_type =PCH_NOP ; - }else { - pch_type =PCH_NONE ; - } + pch_type =intel_pch_type (dev_priv, id); + +/* Sanity check virtual PCH id */ +if (WARN_ON (id && pch_type ==PCH_NONE )) + id =0 ; + dev_priv->pch_type = pch_type; dev_priv->pch_id = id;break ;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: be more strict about HAS_PCH_NOP() usage
In reply to Jani NikulaHAS_PCH_NOP() implies a PCH platform without south display, not generic disabled display. Prefer num_pipes == 0 for PCH independent checks.
--- drivers/gpu/drm/i915/intel_bios.c | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_bios.c +1 -1
@@ -1719,7 +1719,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv)const struct bdb_header *bdb;u8 __iomem *bios =NULL ; -if (HAS_PCH_NOP (dev_priv)) { +if (INTEL_INFO (dev_priv)->num_pipes ==0 ) {DRM_DEBUG_KMS ("Skipping VBT init due to disabled display.\n" );return ; }
drivers/gpu/drm/i915/intel_i2c.c +1 -1
@@ -771,7 +771,7 @@ int intel_setup_gmbus(struct drm_i915_private *dev_priv)unsigned int pin;int ret; -if (HAS_PCH_NOP (dev_priv)) +if (INTEL_INFO (dev_priv)->num_pipes ==0 )return 0 ;if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915: fix PCH_NOP setting for non-PCH platforms
In reply to Jani NikulaSetting PCH type to PCH_NOP before checking whether we actually have a PCH ends up returning true for HAS_PCH_SPLIT() on all non-PCH split platforms. Fix this by using PCH_NOP only for platforms that actually have a PCH.
--- drivers/gpu/drm/i915/i915_drv.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +11 -8
@@ -248,14 +248,6 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) {struct pci_dev *pch =NULL ; -/* In all current cases, num_pipes is equivalent to the PCH_NOP setting -* (which really amounts to a PCH but no South Display). -*/ -if (INTEL_INFO (dev_priv)->num_pipes ==0 ) { - dev_priv->pch_type =PCH_NOP ; -return ; - } -/* * The reason to probe ISA bridge instead of Dev31:Fun0 is to * make graphics device passthrough work easy for VMM, that only
@@ -295,6 +287,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)break ; } } + +/* +* Use PCH_NOP (PCH but no South Display) for PCH platforms without +* display. +*/ +if (pch &&INTEL_INFO (dev_priv)->num_pipes ==0 ) { +DRM_DEBUG_KMS ("Display disabled, reverting to NOP PCH\n" ); + dev_priv->pch_type =PCH_NOP ; + dev_priv->pch_id =0 ; + } +if (!pch)DRM_DEBUG_KMS ("No PCH found.\n" );
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/5] drm/i915: fix guest virtual PCH detection on non-PCH systems
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [1/5] drm/i915: fix guest virtual PCH detection on non-PCH systems
URL : https://patchwork.freedesktop.org/series/44484/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4294 -> Patchwork_9239 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44484/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9239 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: PASS -> INCOMPLETE (fdo#103713)
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)
==== Possible fixes ====
igt@kms_chamelium@dp-crc-fast:
fi-kbl-7500u: DMESG-FAIL (fdo#103841) -> PASS
igt@kms_flip@basic-flip-vs-dpms:
fi-glk-j4005: DMESG-WARN (fdo#106000) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: FAIL (fdo#100368) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
== Participating hosts (41 -> 38) ==
Additional (1): fi-bxt-dsi
Missing (4): fi-byt-j1900 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4294 -> Patchwork_9239
CI_DRM_4294: af0889384edc6de2f91494325d571c66dffea83f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4512: 093fa482371795c3aa246509994eb21907f501b9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9239: 0b3ae319aae1ae31545d9cd3831377a33f3267be @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0b3ae319aae1 drm/i915: fix PCH_NOP setting for non-PCH platforms 8a6f31a1e314 drm/i915: be more strict about HAS_PCH_NOP() usage 81187d8bcb43 drm/i915: clean up virtual PCH special case handling e121641fac1b drm/i915: document PCH_NOPeee2855334c4 drm/i915: fix guest virtual PCH detection on non-PCH systems
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9239/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/5] drm/i915: fix guest virtual PCH detection on non-PCH systems
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [1/5] drm/i915: fix guest virtual PCH detection on non-PCH systems
URL : https://patchwork.freedesktop.org/series/44484/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4294_full -> Patchwork_9239_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9239_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9239_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9239_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-blt:
shard-kbl: PASS -> SKIP
igt@perf_pmu@rc6:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9239_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_gtt:
shard-kbl: PASS -> FAIL (fdo#105347)
igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
shard-hsw: PASS -> FAIL (fdo#104873)
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-hsw: PASS -> FAIL (fdo#105189)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-glk: INCOMPLETE (fdo#103359, k.org#198133) -> PASS
shard-apl: FAIL (fdo#105347) -> PASS
igt@drv_selftest@live_hangcheck:
shard-kbl: DMESG-FAIL (fdo#106560) -> PASS
igt@gem_eio@hibernate:
shard-snb: INCOMPLETE (fdo#105411) -> PASS
igt@kms_flip@modeset-vs-vblank-race-interruptible:
shard-hsw: FAIL (fdo#103060) -> PASS
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS +1
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: FAIL (fdo#104724) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-cpu:
shard-snb: FAIL (fdo#103167, fdo#104724) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4294 -> Patchwork_9239
CI_DRM_4294: af0889384edc6de2f91494325d571c66dffea83f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4512: 093fa482371795c3aa246509994eb21907f501b9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9239: 0b3ae319aae1ae31545d9cd3831377a33f3267be @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9239/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 1 line · Jani Nikula
Just a resend of [1] with Lucas' patch added.
And pushed, thanks for the review and testing.
BR,
Jani.
Quoted 6 lines
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx