| Message ID | 20191126210732.407496-1-matthew.d.roper@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/i915: Handle SDEISR according to PCH rather than platform | expand |
On Tue, 2019-11-26 at 13:07 -0800, Matt Roper wrote: > The South Display is part of the PCH so we should technically be > basing > our port detection logic off the PCH in use rather than the platform > generation. Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 3123958e2081..ddf5bad1b969 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5487,7 +5487,7 @@ static bool icl_combo_port_connected(struct > drm_i915_private *dev_priv, > return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port); > } > > -static bool icl_digital_port_connected(struct intel_encoder > *encoder) > +static bool icp_digital_port_connected(struct intel_encoder > *encoder) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > struct intel_digital_port *dig_port = enc_to_dig_port(&encoder- > >base); > @@ -5525,9 +5525,9 @@ static bool > __intel_digital_port_connected(struct intel_encoder *encoder) > return g4x_digital_port_connected(encoder); > } > > - if (INTEL_GEN(dev_priv) >= 11) > - return icl_digital_port_connected(encoder); > - else if (IS_GEN(dev_priv, 10) || IS_GEN9_BC(dev_priv)) > + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > + return icp_digital_port_connected(encoder); > + else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) > return spt_digital_port_connected(encoder); > else if (IS_GEN9_LP(dev_priv)) > return bxt_digital_port_connected(encoder);
On Tue, Nov 26, 2019 at 11:20:18PM +0000, Patchwork wrote: > == Series Details == > > Series: series starting with [1/3] drm/i915: Handle SDEISR according to PCH rather than platform > URL : https://patchwork.freedesktop.org/series/70073/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_7426 -> Patchwork_15447 > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_15447 absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_15447, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/index.html > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_15447: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@i915_selftest@live_gem_contexts: > - fi-skl-6770hq: [PASS][1] -> [DMESG-FAIL][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/fi-skl-6770hq/igt@i915_selftest@live_gem_contexts.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/fi-skl-6770hq/igt@i915_selftest@live_gem_contexts.html GEM self-test failed: <3>[ 480.076214] idle: Failed with -11! <3>[ 480.090075] i915/i915_gem_context_live_selftests: igt_ctx_sseu failed with error -11 Not related to this series; hitting the re-test button. Matt > > > Known issues > ------------ > > Here are the changes found in Patchwork_15447 that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@kms_chamelium@hdmi-hpd-fast: > - fi-kbl-7500u: [PASS][3] -> [FAIL][4] ([fdo#111045] / [fdo#111096]) > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html > > > #### Possible fixes #### > > * igt@i915_selftest@live_gem_contexts: > - fi-skl-lmem: [DMESG-FAIL][5] -> [PASS][6] > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/fi-skl-lmem/igt@i915_selftest@live_gem_contexts.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/fi-skl-lmem/igt@i915_selftest@live_gem_contexts.html > > > #### Warnings #### > > * igt@gem_exec_suspend@basic-s4-devices: > - fi-kbl-x1275: [DMESG-WARN][7] ([fdo#103558] / [fdo#105602] / [fdo#105763] / [fdo#107139]) -> [DMESG-WARN][8] ([fdo#103558] / [fdo#105602] / [fdo#107139]) > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html > > * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy: > - fi-kbl-x1275: [DMESG-WARN][9] ([fdo#103558] / [fdo#105602] / [fdo#105763]) -> [DMESG-WARN][10] ([fdo#103558] / [fdo#105602]) +5 similar issues > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/fi-kbl-x1275/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/fi-kbl-x1275/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > > * igt@kms_cursor_legacy@basic-flip-after-cursor-atomic: > - fi-kbl-x1275: [DMESG-WARN][11] ([fdo#103558] / [fdo#105602]) -> [DMESG-WARN][12] ([fdo#103558] / [fdo#105602] / [fdo#105763]) +4 similar issues > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/fi-kbl-x1275/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/fi-kbl-x1275/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html > > > [fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558 > [fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602 > [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763 > [fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139 > [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045 > [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096 > > > Participating hosts (49 -> 45) > ------------------------------ > > Additional (2): fi-hsw-4770r fi-whl-u > Missing (6): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus > > > Build changes > ------------- > > * CI: CI-20190529 -> None > * Linux: CI_DRM_7426 -> Patchwork_15447 > > CI-20190529: 20190529 > CI_DRM_7426: b204d72d3485a148456e2077683974739b675b21 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_5310: d1ea62b3f759f10ff6860561ba82e5c4902511d3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_15447: 86c94d0000b657e7adda0a615e7264c25e158e3b @ git://anongit.freedesktop.org/gfx-ci/linux > > > == Linux commits == > > 86c94d0000b6 drm/i915: Program SHPD_FILTER_CNT on CNP+ > 4fe5a19ba44a drm/i915/ehl: Make icp_digital_port_connected() use phy instead of port > 2e5ac97c5e02 drm/i915: Handle SDEISR according to PCH rather than platform > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15447/index.html
On Wed, Nov 27, 2019 at 07:19:08AM +0000, Patchwork wrote: > == Series Details == > > Series: series starting with [1/3] drm/i915: Handle SDEISR according to PCH rather than platform (rev3) > URL : https://patchwork.freedesktop.org/series/70073/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_7428 -> Patchwork_15455 > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_15455 absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_15455, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/index.html > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_15455: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@i915_selftest@live_execlists: > - fi-cfl-8700k: [PASS][1] -> [DMESG-FAIL][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-cfl-8700k/igt@i915_selftest@live_execlists.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-cfl-8700k/igt@i915_selftest@live_execlists.html [ 456.989562] i915/intel_execlists_live_selftests: live_preempt_hang failed with error -5 Another GEM failure that isn't related to the test. Hitting re-test yet again. Matt > > > #### Suppressed #### > > The following results come from untrusted machines, tests, or statuses. > They do not affect the overall result. > > * igt@i915_selftest@live_active: > - {fi-kbl-7560u}: NOTRUN -> [DMESG-FAIL][3] > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-kbl-7560u/igt@i915_selftest@live_active.html > > > Known issues > ------------ > > Here are the changes found in Patchwork_15455 that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@i915_pm_rpm@module-reload: > - fi-skl-lmem: [PASS][4] -> [DMESG-WARN][5] ([fdo#112261]) > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html > > > #### Possible fixes #### > > * igt@i915_module_load@reload-with-fault-injection: > - {fi-kbl-7560u}: [INCOMPLETE][6] ([fdo#109964] / [fdo#112298]) -> [PASS][7] > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-kbl-7560u/igt@i915_module_load@reload-with-fault-injection.html > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-kbl-7560u/igt@i915_module_load@reload-with-fault-injection.html > > * igt@i915_selftest@live_blt: > - fi-bsw-n3050: [DMESG-FAIL][8] ([fdo#112176]) -> [PASS][9] > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-bsw-n3050/igt@i915_selftest@live_blt.html > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-bsw-n3050/igt@i915_selftest@live_blt.html > - fi-hsw-peppy: [DMESG-FAIL][10] ([fdo#112147]) -> [PASS][11] > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-hsw-peppy/igt@i915_selftest@live_blt.html > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-hsw-peppy/igt@i915_selftest@live_blt.html > > * igt@i915_selftest@live_execlists: > - fi-glk-dsi: [DMESG-FAIL][12] -> [PASS][13] > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-glk-dsi/igt@i915_selftest@live_execlists.html > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-glk-dsi/igt@i915_selftest@live_execlists.html > > * igt@kms_busy@basic-flip-pipe-a: > - fi-icl-u2: [TIMEOUT][14] ([fdo#111800]) -> [PASS][15] > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-icl-u2/igt@kms_busy@basic-flip-pipe-a.html > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-icl-u2/igt@kms_busy@basic-flip-pipe-a.html > > * igt@kms_chamelium@hdmi-hpd-fast: > - fi-kbl-7500u: [FAIL][16] ([fdo#111045] / [fdo#111096]) -> [PASS][17] > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html > > > #### Warnings #### > > * igt@gem_exec_suspend@basic-s4-devices: > - fi-kbl-x1275: [DMESG-WARN][18] ([fdo#103558] / [fdo#105602] / [fdo#105763] / [fdo#107139]) -> [DMESG-WARN][19] ([fdo#103558] / [fdo#105602] / [fdo#107139]) > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html > > * igt@kms_flip@basic-flip-vs-modeset: > - fi-kbl-x1275: [DMESG-WARN][20] ([fdo#103558] / [fdo#105602]) -> [DMESG-WARN][21] ([fdo#103558] / [fdo#105602] / [fdo#105763]) +8 similar issues > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-kbl-x1275/igt@kms_flip@basic-flip-vs-modeset.html > > * igt@kms_pipe_crc_basic@hang-read-crc-pipe-a: > - fi-kbl-x1275: [DMESG-WARN][22] ([fdo#103558] / [fdo#105602] / [fdo#105763]) -> [DMESG-WARN][23] ([fdo#103558] / [fdo#105602]) +6 similar issues > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7428/fi-kbl-x1275/igt@kms_pipe_crc_basic@hang-read-crc-pipe-a.html > [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/fi-kbl-x1275/igt@kms_pipe_crc_basic@hang-read-crc-pipe-a.html > > > {name}: This element is suppressed. This means it is ignored when computing > the status of the difference (SUCCESS, WARNING, or FAILURE). > > [fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558 > [fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602 > [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763 > [fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139 > [fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964 > [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045 > [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096 > [fdo#111800]: https://bugs.freedesktop.org/show_bug.cgi?id=111800 > [fdo#112147]: https://bugs.freedesktop.org/show_bug.cgi?id=112147 > [fdo#112176]: https://bugs.freedesktop.org/show_bug.cgi?id=112176 > [fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261 > [fdo#112298]: https://bugs.freedesktop.org/show_bug.cgi?id=112298 > > > Participating hosts (51 -> 45) > ------------------------------ > > Missing (6): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus > > > Build changes > ------------- > > * CI: CI-20190529 -> None > * Linux: CI_DRM_7428 -> Patchwork_15455 > > CI-20190529: 20190529 > CI_DRM_7428: d90242799e46210c5c09e1f0c64db2bb7ee870c6 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_5310: d1ea62b3f759f10ff6860561ba82e5c4902511d3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_15455: d383fec4b9be3418b6ec33147c212276c2340407 @ git://anongit.freedesktop.org/gfx-ci/linux > > > == Linux commits == > > d383fec4b9be drm/i915: Program SHPD_FILTER_CNT on CNP+ > 51dee6a357d0 drm/i915/ehl: Make icp_digital_port_connected() use phy instead of port > d2f45eb90da9 drm/i915: Handle SDEISR according to PCH rather than platform > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15455/index.html
On Tue, Nov 26, 2019 at 01:07:30PM -0800, Matt Roper wrote: >The South Display is part of the PCH so we should technically be basing >our port detection logic off the PCH in use rather than the platform >generation. > >Cc: Lucas De Marchi <lucas.demarchi@intel.com> >Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi >--- > drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c >index 3123958e2081..ddf5bad1b969 100644 >--- a/drivers/gpu/drm/i915/display/intel_dp.c >+++ b/drivers/gpu/drm/i915/display/intel_dp.c >@@ -5487,7 +5487,7 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv, > return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port); > } > >-static bool icl_digital_port_connected(struct intel_encoder *encoder) >+static bool icp_digital_port_connected(struct intel_encoder *encoder) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base); >@@ -5525,9 +5525,9 @@ static bool __intel_digital_port_connected(struct intel_encoder *encoder) > return g4x_digital_port_connected(encoder); > } > >- if (INTEL_GEN(dev_priv) >= 11) >- return icl_digital_port_connected(encoder); >- else if (IS_GEN(dev_priv, 10) || IS_GEN9_BC(dev_priv)) >+ if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) >+ return icp_digital_port_connected(encoder); >+ else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) > return spt_digital_port_connected(encoder); > else if (IS_GEN9_LP(dev_priv)) > return bxt_digital_port_connected(encoder); >-- >2.23.0 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 3123958e2081..ddf5bad1b969 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5487,7 +5487,7 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv, return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port); } -static bool icl_digital_port_connected(struct intel_encoder *encoder) +static bool icp_digital_port_connected(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base); @@ -5525,9 +5525,9 @@ static bool __intel_digital_port_connected(struct intel_encoder *encoder) return g4x_digital_port_connected(encoder); } - if (INTEL_GEN(dev_priv) >= 11) - return icl_digital_port_connected(encoder); - else if (IS_GEN(dev_priv, 10) || IS_GEN9_BC(dev_priv)) + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) + return icp_digital_port_connected(encoder); + else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) return spt_digital_port_connected(encoder); else if (IS_GEN9_LP(dev_priv)) return bxt_digital_port_connected(encoder);
The South Display is part of the PCH so we should technically be basing our port detection logic off the PCH in use rather than the platform generation. Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)