| Message ID | 20210108134802.21280-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Fix HTI port checking | expand |
On Fri, Jan 08, 2021 at 05:48:02AM -0800, José Roberto de Souza wrote: > There was some misinterpretation of specification, when DDIX_USED is > set, the next bit means 0 for DP and 1 for HDMI. > > Anyways this misinterpretation is not causing any issues, this change > is just to comply with specification. > Also as for us it do not matters if it is HDMI or DP, not checking the > port type that HTI is using. > > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> > Cc: Matt Roper <matthew.d.roper@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 3 +-- > drivers/gpu/drm/i915/i915_reg.h | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 3df6913369bc..e90d1af1a54d 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -5321,8 +5321,7 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port) > static bool hti_uses_phy(struct drm_i915_private *i915, enum phy phy) > { > return i915->hti_state & HDPORT_ENABLED && > - (i915->hti_state & HDPORT_PHY_USED_DP(phy) || > - i915->hti_state & HDPORT_PHY_USED_HDMI(phy)); > + i915->hti_state & HDPORT_DDI_USED(phy); > } > > static enum hpd_pin dg1_hpd_pin(struct drm_i915_private *dev_priv, > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 0023c023f472..1d8ba10847ca 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2928,8 +2928,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > > #define HDPORT_STATE _MMIO(0x45050) > #define HDPORT_DPLL_USED_MASK REG_GENMASK(14, 12) > -#define HDPORT_PHY_USED_DP(phy) REG_BIT(2 * (phy) + 2) > -#define HDPORT_PHY_USED_HDMI(phy) REG_BIT(2 * (phy) + 1) > +#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1) > #define HDPORT_ENABLED REG_BIT(0) > > /* Make render/texture TLB fetches lower priorty than associated data > -- > 2.30.0 >
On Fri, 2021-01-08 at 21:20 +0000, Patchwork wrote:
Patch Details
Series: drm/i915: Fix HTI port checking
URL: https://patchwork.freedesktop.org/series/85615/
State: success
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/index.html
CI Bug Log - changes from CI_DRM_9566_full -> Patchwork_19292_full
Summary
SUCCESS
No regressions found.
Patch pushed, thanks for the review Matt R.
Known issues
Here are the changes found in Patchwork_19292_full that come from known issues:
IGT changes
Issues hit
* igt@feature_discovery@display-2x:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@feature_discovery@display-2x.html> (i915#1839<https://gitlab.freedesktop.org/drm/intel/issues/1839>)
* igt@gem_ctx_persistence@processes:
* shard-hsw: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-hsw7/igt@gem_ctx_persistence@processes.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#1099<https://gitlab.freedesktop.org/drm/intel/issues/1099>) +1 similar issue
* igt@gem_exec_whisper@basic-queues-all:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-glk5/igt@gem_exec_whisper@basic-queues-all.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-glk1/igt@gem_exec_whisper@basic-queues-all.html> (i915#118<https://gitlab.freedesktop.org/drm/intel/issues/118> / i915#95<https://gitlab.freedesktop.org/drm/intel/issues/95>)
* igt@gem_pread@exhaustion:
* shard-hsw: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-hsw7/igt@gem_pread@exhaustion.html> (i915#2658<https://gitlab.freedesktop.org/drm/intel/issues/2658>)
* igt@gem_userptr_blits@process-exit-mmap@wc:
* shard-hsw: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-hsw7/igt@gem_userptr_blits@process-exit-mmap@wc.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +145 similar issues
* igt@gen3_render_mixed_blits:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl6/igt@gen3_render_mixed_blits.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +15 similar issues
* igt@gen9_exec_parse@bb-start-cmd:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@gen9_exec_parse@bb-start-cmd.html> (fdo#112306<https://bugs.freedesktop.org/show_bug.cgi?id=112306>)
* igt@i915_pm_dc@dc3co-vpb-simulation:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl2/igt@i915_pm_dc@dc3co-vpb-simulation.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#658<https://gitlab.freedesktop.org/drm/intel/issues/658>)
* igt@i915_selftest@live@gt_lrc:
* shard-tglb: NOTRUN -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@i915_selftest@live@gt_lrc.html> (i915#2373<https://gitlab.freedesktop.org/drm/intel/issues/2373>)
* igt@i915_selftest@live@gt_pm:
* shard-tglb: NOTRUN -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@i915_selftest@live@gt_pm.html> (i915#1759<https://gitlab.freedesktop.org/drm/intel/issues/1759> / i915#2291<https://gitlab.freedesktop.org/drm/intel/issues/2291>)
* igt@kms_ccs@pipe-c-missing-ccs-buffer:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl2/igt@kms_ccs@pipe-c-missing-ccs-buffer.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / fdo#111304<https://bugs.freedesktop.org/show_bug.cgi?id=111304>)
* igt@kms_color@pipe-a-ctm-0-75:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl2/igt@kms_color@pipe-a-ctm-0-75.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl10/igt@kms_color@pipe-a-ctm-0-75.html> (i915#1982<https://gitlab.freedesktop.org/drm/intel/issues/1982>) +2 similar issues
* igt@kms_color_chamelium@pipe-b-ctm-0-75:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@kms_color_chamelium@pipe-b-ctm-0-75.html> (fdo#109284<https://bugs.freedesktop.org/show_bug.cgi?id=109284> / fdo#111827<https://bugs.freedesktop.org/show_bug.cgi?id=111827>) +2 similar issues
* igt@kms_color_chamelium@pipe-d-gamma:
* shard-hsw: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-hsw7/igt@kms_color_chamelium@pipe-d-gamma.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / fdo#111827<https://bugs.freedesktop.org/show_bug.cgi?id=111827>) +11 similar issues
* igt@kms_cursor_crc@pipe-a-cursor-128x42-onscreen:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl2/igt@kms_cursor_crc@pipe-a-cursor-128x42-onscreen.html> (i915#54<https://gitlab.freedesktop.org/drm/intel/issues/54>) +1 similar issue
* igt@kms_cursor_crc@pipe-a-cursor-64x64-sliding:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl6/igt@kms_cursor_crc@pipe-a-cursor-64x64-sliding.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl4/igt@kms_cursor_crc@pipe-a-cursor-64x64-sliding.html> (i915#54<https://gitlab.freedesktop.org/drm/intel/issues/54>) +5 similar issues
* igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@kms_cursor_crc@pipe-d-cursor-512x512-sliding.html> (fdo#109279<https://bugs.freedesktop.org/show_bug.cgi?id=109279>)
* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic.html> (fdo#111825<https://bugs.freedesktop.org/show_bug.cgi?id=111825>) +2 similar issues
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html> (i915#2346<https://gitlab.freedesktop.org/drm/intel/issues/2346>)
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl5/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> (i915#79<https://gitlab.freedesktop.org/drm/intel/issues/79>) +1 similar issue
* igt@kms_flip@flip-vs-expired-vblank@b-dp1:
* shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-apl4/igt@kms_flip@flip-vs-expired-vblank@b-dp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-apl4/igt@kms_flip@flip-vs-expired-vblank@b-dp1.html> (i915#79<https://gitlab.freedesktop.org/drm/intel/issues/79>)
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html> (i915#79<https://gitlab.freedesktop.org/drm/intel/issues/79>)
* igt@kms_flip@flip-vs-suspend@c-hdmi-a1:
* shard-hsw: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-hsw7/igt@kms_flip@flip-vs-suspend@c-hdmi-a1.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-hsw6/igt@kms_flip@flip-vs-suspend@c-hdmi-a1.html> (i915#2055<https://gitlab.freedesktop.org/drm/intel/issues/2055>)
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl2/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl8/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html> (i915#2122<https://gitlab.freedesktop.org/drm/intel/issues/2122>) +3 similar issues
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt.html> (i915#49<https://gitlab.freedesktop.org/drm/intel/issues/49>)
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-alpha-7efc.html> (fdo#108145<https://bugs.freedesktop.org/show_bug.cgi?id=108145> / i915#265<https://gitlab.freedesktop.org/drm/intel/issues/265>)
* igt@kms_psr@psr2_primary_mmap_cpu:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-iclb3/igt@kms_psr@psr2_primary_mmap_cpu.html> (fdo#109441<https://bugs.freedesktop.org/show_bug.cgi?id=109441>) +2 similar issues
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl4/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl4/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html> (i915#198<https://gitlab.freedesktop.org/drm/intel/issues/198>)
* igt@kms_writeback@writeback-fb-id:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@kms_writeback@writeback-fb-id.html> (i915#2437<https://gitlab.freedesktop.org/drm/intel/issues/2437>)
Possible fixes
* {igt@gem_exec_fair@basic-deadline}:
* shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-glk2/igt@gem_exec_fair@basic-deadline.html> (i915#2846<https://gitlab.freedesktop.org/drm/intel/issues/2846>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-glk4/igt@gem_exec_fair@basic-deadline.html>
* {igt@gem_exec_fair@basic-none@vcs0}:
* shard-apl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-apl7/igt@gem_exec_fair@basic-none@vcs0.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-apl6/igt@gem_exec_fair@basic-none@vcs0.html>
* {igt@gem_exec_fair@basic-pace-solo@rcs0}:
* shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-glk3/igt@gem_exec_fair@basic-pace-solo@rcs0.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-glk7/igt@gem_exec_fair@basic-pace-solo@rcs0.html>
* {igt@gem_exec_fair@basic-pace@vcs1}:
* shard-kbl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-kbl4/igt@gem_exec_fair@basic-pace@vcs1.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html> +1 similar issue
* {igt@gem_exec_fair@basic-pace@vecs0}:
* shard-kbl: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-kbl4/igt@gem_exec_fair@basic-pace@vecs0.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-kbl3/igt@gem_exec_fair@basic-pace@vecs0.html>
* igt@gem_exec_whisper@basic-contexts-priority:
* shard-glk: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-glk5/igt@gem_exec_whisper@basic-contexts-priority.html> (i915#118<https://gitlab.freedesktop.org/drm/intel/issues/118> / i915#95<https://gitlab.freedesktop.org/drm/intel/issues/95>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-glk9/igt@gem_exec_whisper@basic-contexts-priority.html> +1 similar issue
* {igt@gem_vm_create@destroy-race}:
* shard-tglb: TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-tglb8/igt@gem_vm_create@destroy-race.html> (i915#2795<https://gitlab.freedesktop.org/drm/intel/issues/2795>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@gem_vm_create@destroy-race.html>
* igt@gem_workarounds@suspend-resume-context:
* shard-tglb: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-tglb2/igt@gem_workarounds@suspend-resume-context.html> (i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295> / i915#456<https://gitlab.freedesktop.org/drm/intel/issues/456>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb6/igt@gem_workarounds@suspend-resume-context.html>
* igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl10/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html> (i915#54<https://gitlab.freedesktop.org/drm/intel/issues/54>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl8/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html> +5 similar issues
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
* shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-tglb7/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> (i915#2598<https://gitlab.freedesktop.org/drm/intel/issues/2598>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-tglb5/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html>
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl5/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html> (i915#2122<https://gitlab.freedesktop.org/drm/intel/issues/2122>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html>
* igt@kms_hdr@bpc-switch-dpms:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl4/igt@kms_hdr@bpc-switch-dpms.html> (i915#1188<https://gitlab.freedesktop.org/drm/intel/issues/1188>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl1/igt@kms_hdr@bpc-switch-dpms.html>
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html> (fdo#108145<https://bugs.freedesktop.org/show_bug.cgi?id=108145> / i915#265<https://gitlab.freedesktop.org/drm/intel/issues/265>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html> +1 similar issue
* igt@kms_plane_lowres@pipe-a-tiling-y:
* shard-kbl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-kbl2/igt@kms_plane_lowres@pipe-a-tiling-y.html> (i915#165<https://gitlab.freedesktop.org/drm/intel/issues/165> / i915#180<https://gitlab.freedesktop.org/drm/intel/issues/180> / i915#2621<https://gitlab.freedesktop.org/drm/intel/issues/2621> / i915#78<https://gitlab.freedesktop.org/drm/intel/issues/78>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-kbl4/igt@kms_plane_lowres@pipe-a-tiling-y.html>
* igt@kms_psr2_su@frontbuffer:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-iclb7/igt@kms_psr2_su@frontbuffer.html> (fdo#109642<https://bugs.freedesktop.org/show_bug.cgi?id=109642> / fdo#111068<https://bugs.freedesktop.org/show_bug.cgi?id=111068>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-iclb2/igt@kms_psr2_su@frontbuffer.html>
* igt@kms_psr@psr2_sprite_plane_move:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html> (fdo#109441<https://bugs.freedesktop.org/show_bug.cgi?id=109441>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html> +2 similar issues
* igt@perf@polling-parameterized:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl1/igt@perf@polling-parameterized.html> (i915#1542<https://gitlab.freedesktop.org/drm/intel/issues/1542>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl7/igt@perf@polling-parameterized.html>
Warnings
* igt@i915_pm_rc6_residency@rc6-fence:
* shard-iclb: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-iclb8/igt@i915_pm_rc6_residency@rc6-fence.html> (i915#2681<https://gitlab.freedesktop.org/drm/intel/issues/2681> / i915#2684<https://gitlab.freedesktop.org/drm/intel/issues/2684>) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-iclb4/igt@i915_pm_rc6_residency@rc6-fence.html> (i915#1804<https://gitlab.freedesktop.org/drm/intel/issues/1804> / i915#2684<https://gitlab.freedesktop.org/drm/intel/issues/2684>)
* igt@i915_pm_rc6_residency@rc6-idle:
* shard-iclb: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-iclb6/igt@i915_pm_rc6_residency@rc6-idle.html> (i915#1804<https://gitlab.freedesktop.org/drm/intel/issues/1804> / i915#2684<https://gitlab.freedesktop.org/drm/intel/issues/2684>) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-iclb5/igt@i915_pm_rc6_residency@rc6-idle.html> (i915#2684<https://gitlab.freedesktop.org/drm/intel/issues/2684>)
* igt@kms_content_protection@srm:
* shard-apl: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-apl1/igt@kms_content_protection@srm.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-apl2/igt@kms_content_protection@srm.html> (i915#1319<https://gitlab.freedesktop.org/drm/intel/issues/1319>)
* igt@runner@aborted:
* shard-kbl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-kbl1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-kbl6/igt@runner@aborted.html>) (i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295> / i915#2426<https://gitlab.freedesktop.org/drm/intel/issues/2426> / i915#2505<https://gitlab.freedesktop.org/drm/intel/issues/2505>) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-kbl4/igt@runner@aborted.html>) (i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295> / i915#2426<https://gitlab.freedesktop.org/drm/intel/issues/2426>)
* shard-skl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl8/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9566/shard-skl4/igt@runner@aborted.html>) (i915#2029<https://gitlab.freedesktop.org/drm/intel/issues/2029> / i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19292/shard-skl4/igt@runner@aborted.html> (i915#2426<https://gitlab.freedesktop.org/drm/intel/issues/2426>)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
Participating hosts (10 -> 10)
No changes in participating hosts
Build changes
* Linux: CI_DRM_9566 -> Patchwork_19292
CI-20190529: 20190529
CI_DRM_9566: 43ca049026a4c8808645c7f21cb0fc34a337c612 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5951: fec3b9c7d88357144f0d7a1447b9316a1c81da1a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19292: d7e254bf929b82d237306e002cd63494946218e9 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 3df6913369bc..e90d1af1a54d 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -5321,8 +5321,7 @@ intel_ddi_max_lanes(struct intel_digital_port *dig_port) static bool hti_uses_phy(struct drm_i915_private *i915, enum phy phy) { return i915->hti_state & HDPORT_ENABLED && - (i915->hti_state & HDPORT_PHY_USED_DP(phy) || - i915->hti_state & HDPORT_PHY_USED_HDMI(phy)); + i915->hti_state & HDPORT_DDI_USED(phy); } static enum hpd_pin dg1_hpd_pin(struct drm_i915_private *dev_priv, diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 0023c023f472..1d8ba10847ca 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2928,8 +2928,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) #define HDPORT_STATE _MMIO(0x45050) #define HDPORT_DPLL_USED_MASK REG_GENMASK(14, 12) -#define HDPORT_PHY_USED_DP(phy) REG_BIT(2 * (phy) + 2) -#define HDPORT_PHY_USED_HDMI(phy) REG_BIT(2 * (phy) + 1) +#define HDPORT_DDI_USED(phy) REG_BIT(2 * (phy) + 1) #define HDPORT_ENABLED REG_BIT(0) /* Make render/texture TLB fetches lower priorty than associated data
There was some misinterpretation of specification, when DDIX_USED is set, the next bit means 0 for DP and 1 for HDMI. Anyways this misinterpretation is not causing any issues, this change is just to comply with specification. Also as for us it do not matters if it is HDMI or DP, not checking the port type that HTI is using. Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 3 +-- drivers/gpu/drm/i915/i915_reg.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)