drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders

PATCH In review Jani Nikula 3 participants 5 messages Mar 19, 2021 – Mar 23, 2021

Subsystems (4)

Stable branch DRM drivers Intel i915 Intel DRM display for xe and i915 drivers

lore

Share & tools

lore

Jani Nikula

author

2021-03-19 11:53 UTC #0 lore raw

PATCH 1/1 drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders

Use the correct DSS CTL registers for ICL DSI transcoders.

As a side effect, this also brings back the sanity check for trying to use pipe DSC registers on pipe A on ICL.

Fixes 8a029c113b17 ("drm/i915/dp: Modify VDSC helpers to configure DSC for Bigjoiner slave")

References: http://lore.kernel.org/r/[email protected]

Cc Manasi Navare <[email protected]>

Cc Animesh Manna <[email protected]>

Cc Vandita Kulkarni <[email protected]>

Cc <[email protected]> # v5.11+

Signed-off-by Jani Nikula <[email protected]>

---

Untested, I don't have the platform.

---
 drivers/gpu/drm/i915/display/intel_vdsc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

drivers/gpu/drm/i915/display/intel_vdsc.c +2 -8

index f58cc5700784..a86c57d117f2 100644
@@ -1014,20 +1014,14 @@ static i915_reg_t dss_ctl1_reg(const struct intel_crtc_state *crtc_state)
 {
 	enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
 
-	if (crtc_state->cpu_transcoder == TRANSCODER_EDP)
-		return DSS_CTL1;
-
-	return ICL_PIPE_DSS_CTL1(pipe);
+	return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL1(pipe) : DSS_CTL1;
 }
 
 static i915_reg_t dss_ctl2_reg(const struct intel_crtc_state *crtc_state)
 {
 	enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
 
-	if (crtc_state->cpu_transcoder == TRANSCODER_EDP)
-		return DSS_CTL2;
-
-	return ICL_PIPE_DSS_CTL2(pipe);
+	return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL2(pipe) : DSS_CTL2;
 }
 
 void intel_dsc_enable(struct intel_encoder *encoder,

Signature · 6 lines

2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patchwork

2021-03-19 14:20 UTC #1 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders

== Series Details ==

Series: drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders
URL : https://patchwork.freedesktop.org/series/88169/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9875 -> Patchwork_19811
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/index.html

Known issues
------------

Here are the changes found in Patchwork_19811 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@execlists:
- fi-bsw-kefka: [PASS][1] -> [INCOMPLETE][2] ([i915#2940])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/fi-bsw-kefka/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/fi-bsw-kefka/igt@i915_selftest@[email protected]

* igt@runner@aborted:
- fi-bsw-kefka: NOTRUN -> [FAIL][3] ([i915#1436] / [i915#2722])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/fi-bsw-kefka/igt@[email protected]

#### Possible fixes ####

* igt@gem_tiled_fence_blits@basic:
- fi-kbl-8809g: [TIMEOUT][4] ([i915#3145]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/fi-kbl-8809g/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/fi-kbl-8809g/igt@[email protected]

#### Warnings ####

* igt@i915_pm_rpm@basic-rte:
- fi-kbl-guc: [SKIP][6] ([fdo#109271]) -> [FAIL][7] ([i915#3049])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/fi-kbl-guc/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/fi-kbl-guc/igt@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#3049]: https://gitlab.freedesktop.org/drm/intel/issues/3049
[i915#3145]: https://gitlab.freedesktop.org/drm/intel/issues/3145

Participating hosts (44 -> 40)
------------------------------

Missing (4): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus fi-hsw-4200u

Build changes
-------------

* Linux: CI_DRM_9875 -> Patchwork_19811

CI-20190529: 20190529
CI_DRM_9875: 218e09274103c3117d90167bb3ee0ba3a0a63f84 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6039: 8c4a2cda2a92bdd87797969ef299ad7f6e8e993b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19811: f047ddfc89c0417d869a0f2821445aa04d0f9465 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

f047ddfc89c0 drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patchwork

2021-03-19 17:35 UTC #2 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders

In reply to Jani Nikula

== Series Details ==

Series: drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders
URL : https://patchwork.freedesktop.org/series/88169/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_9875_full -> Patchwork_19811_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_19811_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_19811_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_19811_full:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_schedule@pi-common@vecs0:
- shard-skl: [PASS][1] -> [FAIL][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-skl4/igt@gem_exec_schedule@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl10/igt@gem_exec_schedule@[email protected]

Known issues
------------

Here are the changes found in Patchwork_19811_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@drm_mm@all@insert_range:
- shard-skl: NOTRUN -> [INCOMPLETE][3] ([i915#2485])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl10/igt@drm_mm@all@insert_range.html

* igt@gem_ctx_persistence@clone:
- shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1099]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-snb2/igt@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-skl: NOTRUN -> [FAIL][5] ([i915#2846])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl9/igt@[email protected]
- shard-apl: NOTRUN -> [FAIL][6] ([i915#2846])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl3/igt@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2842])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-glk4/igt@gem_exec_fair@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-glk6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-iclb: [PASS][9] -> [FAIL][10] ([i915#2842]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb8/igt@gem_exec_fair@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: [PASS][11] -> [FAIL][12] ([i915#2842]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-kbl4/igt@gem_exec_fair@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_schedule@u-fairslice@rcs0:
- shard-iclb: [PASS][13] -> [DMESG-WARN][14] ([i915#2803])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb2/igt@gem_exec_schedule@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb7/igt@gem_exec_schedule@[email protected]

* igt@gem_exec_whisper@basic-forked:
- shard-glk: [PASS][15] -> [DMESG-WARN][16] ([i915#118] / [i915#95])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-glk9/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-glk9/igt@[email protected]

* igt@gem_pread@exhaustion:
- shard-apl: NOTRUN -> [WARN][17] ([i915#2658])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl7/igt@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-snb: NOTRUN -> [WARN][18] ([i915#2658])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-snb2/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-skl: NOTRUN -> [FAIL][19] ([i915#454])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl9/igt@[email protected]

* igt@i915_selftest@live@gt_pm:
- shard-skl: NOTRUN -> [DMESG-FAIL][20] ([i915#1886] / [i915#2291])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl9/igt@i915_selftest@live@gt_pm.html

* igt@kms_big_joiner@invalid-modeset:
- shard-apl: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#2705])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl8/igt@[email protected]

* igt@kms_chamelium@hdmi-mode-timings:
- shard-kbl: NOTRUN -> [SKIP][22] ([fdo#109271] / [fdo#111827]) +4 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl1/igt@[email protected]

* igt@kms_color_chamelium@pipe-c-ctm-red-to-blue:
- shard-snb: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827]) +11 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-snb2/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-ctm-limited-range:
- shard-apl: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +16 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl3/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-d-128x128-right-edge:
- shard-snb: NOTRUN -> [SKIP][25] ([fdo#109271]) +248 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-snb5/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-apl: [PASS][26] -> [DMESG-WARN][27] ([i915#180])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-apl3/igt@kms_flip@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl2/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [PASS][28] -> [DMESG-WARN][29] ([i915#180]) +8 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-kbl2/igt@kms_flip@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl2/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render:
- shard-skl: [PASS][30] -> [FAIL][31] ([i915#49])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-skl4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render.html

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-kbl: NOTRUN -> [SKIP][32] ([fdo#109271]) +54 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-cpu.html

* igt@kms_invalid_dotclock:
- shard-skl: NOTRUN -> [SKIP][33] ([fdo#109271]) +26 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl1/igt@kms_invalid_dotclock.html

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-skl: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#533])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl1/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#533])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl4/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][36] ([fdo#109271] / [i915#533])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-apl: NOTRUN -> [FAIL][37] ([fdo#108145] / [i915#265])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl1/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][38] ([i915#265]) +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][39] -> [FAIL][40] ([fdo#108145] / [i915#265])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-skl9/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl8/igt@[email protected]

* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-apl: NOTRUN -> [SKIP][41] ([fdo#109271] / [i915#2733])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl7/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2:
- shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271] / [i915#658]) +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl7/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
- shard-kbl: NOTRUN -> [SKIP][43] ([fdo#109271] / [i915#658]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl1/igt@[email protected]

* igt@kms_psr@psr2_sprite_mmap_cpu:
- shard-iclb: [PASS][44] -> [SKIP][45] ([fdo#109441])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb5/igt@kms_psr@psr2_sprite_mmap_cpu.html

* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][46] ([i915#31])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-snb2/igt@[email protected]

* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][47] ([IGT#2])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl1/igt@kms_sysfs_edid_timing.html

* igt@kms_vblank@pipe-d-ts-continuation-idle:
- shard-apl: NOTRUN -> [SKIP][48] ([fdo#109271]) +174 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl7/igt@[email protected]

* igt@kms_writeback@writeback-fb-id:
- shard-apl: NOTRUN -> [SKIP][49] ([fdo#109271] / [i915#2437]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl8/igt@[email protected]

* igt@perf@polling-small-buf:
- shard-skl: [PASS][50] -> [FAIL][51] ([i915#1722])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-skl8/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl7/igt@[email protected]

* igt@sysfs_clients@busy@vcs0:
- shard-kbl: [PASS][52] -> [FAIL][53] ([i915#3009]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-kbl3/igt@sysfs_clients@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl6/igt@sysfs_clients@[email protected]

* igt@sysfs_clients@recycle-many:
- shard-iclb: [PASS][54] -> [FAIL][55] ([i915#3028])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb8/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb6/igt@[email protected]
- shard-kbl: [PASS][56] -> [FAIL][57] ([i915#3028])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-kbl1/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl3/igt@[email protected]

#### Possible fixes ####

* igt@drm_mm@all@replace:
- shard-skl: [INCOMPLETE][58] ([i915#2485]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-skl4/igt@drm_mm@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl10/igt@drm_mm@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][60] ([i915#2842]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-kbl4/igt@gem_exec_fair@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@vecs0:
- shard-glk: [FAIL][62] ([i915#2842]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-glk4/igt@gem_exec_fair@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-glk1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][64] ([i915#2842]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-tglb8/igt@gem_exec_fair@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-tglb3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][66] ([i915#2849]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb4/igt@gem_exec_fair@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_schedule@u-fairslice@vcs0:
- shard-skl: [DMESG-WARN][68] ([i915#1610] / [i915#2803]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-skl2/igt@gem_exec_schedule@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl9/igt@gem_exec_schedule@[email protected]

* igt@gem_mmap_gtt@cpuset-medium-copy:
- shard-iclb: [FAIL][70] ([i915#307]) -> [PASS][71] +1 similar issue
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb7/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb5/igt@[email protected]

* igt@i915_suspend@forcewake:
- shard-kbl: [DMESG-WARN][72] ([i915#180]) -> [PASS][73] +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-kbl4/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl1/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [DMESG-WARN][74] ([i915#180]) -> [PASS][75] +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-apl3/igt@kms_flip@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-apl2/igt@kms_flip@[email protected]

* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][76] ([i915#1188]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-skl9/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-skl8/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][78] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][79]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb6/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb2/igt@[email protected]

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][80] ([fdo#109441]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb6/igt@kms_psr@psr2_sprite_plane_move.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-kbl: [INCOMPLETE][82] ([i915#155]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-kbl4/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-kbl7/igt@[email protected]

* igt@perf@polling-parameterized:
- shard-tglb: [FAIL][84] ([i915#1542]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-tglb8/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-tglb7/igt@[email protected]

* igt@sysfs_clients@recycle:
- shard-glk: [FAIL][86] ([i915#3028]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-glk4/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-glk1/igt@[email protected]

#### Warnings ####

* igt@kms_content_protection@atomic-dpms:
- shard-iclb: [SKIP][88] ([fdo#109300] / [fdo#111066]) -> [FAIL][89] ([i915#3144])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb2/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb1/igt@[email protected]

* igt@kms_content_protection@legacy:
- shard-iclb: [FAIL][90] ([i915#3144]) -> [SKIP][91] ([fdo#109300] / [fdo#111066])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb1/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb6/igt@[email protected]

* igt@kms_content_protection@type1:
- shard-iclb: [SKIP][92] ([fdo#109300] / [fdo#111066]) -> [FAIL][93] ([i915#3137])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb5/igt@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb1/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-2:
- shard-iclb: [SKIP][94] ([i915#2920]) -> [SKIP][95] ([i915#658]) +2 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb2/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb6/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][96] ([i915#658]) -> [SKIP][97] ([i915#2920])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9875/shard-iclb3/igt@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/shard-iclb2/igt@[email protected]

Participating hosts (11 -> 11)
------------------------------

No changes in participating hosts

Build changes
-------------

* Linux: CI_DRM_9875 -> Patchwork_19811

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19811/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Navare, Manasi

Reviewed-by on v1 1/1

2021-03-19 20:38 UTC #3 lore raw

In reply to Jani Nikula

Quoted 7 lines · Jani Nikula

Use the correct DSS CTL registers for ICL DSI transcoders.
As a side effect, this also brings back the sanity check for trying to use pipe DSC registers on pipe A on ICL.
Fixes 8a029c113b17 ("drm/i915/dp: Modify VDSC helpers to configure DSC for Bigjoiner slave")
References: http://lore.kernel.org/r/[email protected]

Thanks Jani for the detailed review comments here and explanation on what broke the DSI DSC on < Gen 12 platforms.

Quoted 18 lines

Cc Manasi Navare <[email protected]>
Cc Animesh Manna <[email protected]>
Cc Vandita Kulkarni <[email protected]>
Cc <[email protected]> # v5.11+
Signed-off-by Jani Nikula <[email protected]>
---
Untested, I don't have the platform.
---
 drivers/gpu/drm/i915/display/intel_vdsc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_vdsc.c +0 -0
index f58cc5700784..a86c57d117f2 100644

drivers/gpu/drm/i915/display/intel_vdsc.c static i915_reg_t dss_ctl1_reg(const struct intel_crtc_state *crtc_state) · line 1017

Quoted 8 lines

drivers/gpu/drm/i915/display/intel_vdsc.c +1 -4

@@ -1014,20 +1014,14 @@ static i915_reg_t dss_ctl1_reg(const struct intel_crtc_state *crtc_state)
 {
 	enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
 
-	if (crtc_state->cpu_transcoder == TRANSCODER_EDP)
-		return DSS_CTL1;
-
-	return ICL_PIPE_DSS_CTL1(pipe);
+	return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL1(pipe) : DSS_CTL1;

Yes using is_pipe_dsc() makes sense here in order to select proper DSS_CTL regs for DSI.

Reviewed-by Manasi Navare <[email protected]>

Manasi

Quoted 17 lines

drivers/gpu/drm/i915/display/intel_vdsc.c +1 -4

 }
 
 static i915_reg_t dss_ctl2_reg(const struct intel_crtc_state *crtc_state)
 {
 	enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
 
-	if (crtc_state->cpu_transcoder == TRANSCODER_EDP)
-		return DSS_CTL2;
-
-	return ICL_PIPE_DSS_CTL2(pipe);
+	return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL2(pipe) : DSS_CTL2;
 }
 
 void intel_dsc_enable(struct intel_encoder *encoder,

Signature · 1 line

2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Jani Nikula

author

2021-03-23 10:23 UTC #4 lore raw

Quoted 42 lines · Manasi

Quoted 7 lines · Jani Nikula
Use the correct DSS CTL registers for ICL DSI transcoders.
As a side effect, this also brings back the sanity check for trying to use pipe DSC registers on pipe A on ICL.
Fixes 8a029c113b17 ("drm/i915/dp: Modify VDSC helpers to configure DSC for Bigjoiner slave")
References: http://lore.kernel.org/r/[email protected]
Thanks Jani for the detailed review comments here and explanation on what broke the DSI DSC on < Gen 12 platforms.
Quoted 18 lines
Cc Manasi Navare <[email protected]>
Cc Animesh Manna <[email protected]>
Cc Vandita Kulkarni <[email protected]>
Cc <[email protected]> # v5.11+
Signed-off-by Jani Nikula <[email protected]>
---
Untested, I don't have the platform.
---
 drivers/gpu/drm/i915/display/intel_vdsc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_vdsc.c +0 -0
index f58cc5700784..a86c57d117f2 100644
drivers/gpu/drm/i915/display/intel_vdsc.c static i915_reg_t dss_ctl1_reg(const struct intel_crtc_state *crtc_state) · line 1017
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_vdsc.c +1 -4
@@ -1014,20 +1014,14 @@ static i915_reg_t dss_ctl1_reg(const struct intel_crtc_state *crtc_state)
 {
 	enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
 
-	if (crtc_state->cpu_transcoder == TRANSCODER_EDP)
-		return DSS_CTL1;
-
-	return ICL_PIPE_DSS_CTL1(pipe);
+	return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL1(pipe) : DSS_CTL1;
Yes using is_pipe_dsc() makes sense here in order to select proper DSS_CTL regs for DSI.

Quoted 1 line

Reviewed-by Manasi Navare <[email protected]>

Thanks, pushed to drm-intel-next.

BR,
Jani.

Quoted 24 lines

Manasi
Quoted 17 lines
drivers/gpu/drm/i915/display/intel_vdsc.c +1 -4
 }
 
 static i915_reg_t dss_ctl2_reg(const struct intel_crtc_state *crtc_state)
 {
 	enum pipe pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe;
 
-	if (crtc_state->cpu_transcoder == TRANSCODER_EDP)
-		return DSS_CTL2;
-
-	return ICL_PIPE_DSS_CTL2(pipe);
+	return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL2(pipe) : DSS_CTL2;
 }
 
 void intel_dsc_enable(struct intel_encoder *encoder,
Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines

Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx