Skip to contentSkip to conversation

drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner

PATCH In review Stanislav Lisovskiy 4 participants 7 messages Jun 28, 2023 – Jun 30, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner

If we are using Bigjoiner dpll_hw_state is supposed to be exactly same as for master crtc, so no need to save it's state for slave crtc.

---
 drivers/gpu/drm/i915/display/intel_display.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -1
index 43d6ba980780..c3e93bdde29d 100644
@@ -4568,7 +4568,6 @@ copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state,
 	saved_state->uapi = slave_crtc_state->uapi;
 	saved_state->scaler_state = slave_crtc_state->scaler_state;
 	saved_state->shared_dpll = slave_crtc_state->shared_dpll;
-	saved_state->dpll_hw_state = slave_crtc_state->dpll_hw_state;
 	saved_state->crc_enabled = slave_crtc_state->crc_enabled;
 
 	intel_crtc_free_hw_state(slave_crtc_state);
Signature · 1 line
2.37.3
maintainer
#1 lore raw
Quoted 2 lines · Stanislav Lisovskiy

If we are using Bigjoiner dpll_hw_state is supposed to be exactly same as for master crtc, so no need to save it's state for slave crtc.

Could this help with [1]?

BR,
Jani.

[1] https://gitlab.freedesktop.org/drm/intel/-/issues/8720

Quoted 18 lines
---
 drivers/gpu/drm/i915/display/intel_display.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -1
index 43d6ba980780..c3e93bdde29d 100644
@@ -4568,7 +4568,6 @@ copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state,
 	saved_state->uapi = slave_crtc_state->uapi;
 	saved_state->scaler_state = slave_crtc_state->scaler_state;
 	saved_state->shared_dpll = slave_crtc_state->shared_dpll;
-	saved_state->dpll_hw_state = slave_crtc_state->dpll_hw_state;
 	saved_state->crc_enabled = slave_crtc_state->crc_enabled;
 
 	intel_crtc_free_hw_state(slave_crtc_state);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#2 lore raw
Quoted 10 lines · Jani Nikula
Quoted 2 lines · Stanislav Lisovskiy

If we are using Bigjoiner dpll_hw_state is supposed to be exactly same as for master crtc, so no need to save it's state for slave crtc.

Could this help with [1]?

BR,
Jani.

[1] https://gitlab.freedesktop.org/drm/intel/-/issues/8720

I don't think that would help, here this is mostly a cosmetic fix to remove dmesg warn caused by slave crtc sw/hw state mismatch, because we don't calculate pll state for slave crtc in Bigjoiner, but still try to verify it against the values in the correspodent hw.

Stan

Quoted 22 lines
Quoted 19 lines
---
 drivers/gpu/drm/i915/display/intel_display.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -1
index 43d6ba980780..c3e93bdde29d 100644
@@ -4568,7 +4568,6 @@ copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state,
 	saved_state->uapi = slave_crtc_state->uapi;
 	saved_state->scaler_state = slave_crtc_state->scaler_state;
 	saved_state->shared_dpll = slave_crtc_state->shared_dpll;
-	saved_state->dpll_hw_state = slave_crtc_state->dpll_hw_state;
 	saved_state->crc_enabled = slave_crtc_state->crc_enabled;
 
 	intel_crtc_free_hw_state(slave_crtc_state);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
maintainer
#3 lore raw
Quoted 10 lines · Stanislav
Quoted 9 lines · Jani Nikula
Quoted 2 lines · Stanislav Lisovskiy

If we are using Bigjoiner dpll_hw_state is supposed to be exactly same as for master crtc, so no need to save it's state for slave crtc.

Could this help with [1]?

BR,
Jani.

Quoted 6 lines
Quoted 1 line

[1] https://gitlab.freedesktop.org/drm/intel/-/issues/8720

I don't think that would help, here this is mostly a cosmetic fix to remove dmesg warn caused by slave crtc sw/hw state mismatch, because we don't calculate pll state for slave crtc in Bigjoiner, but still try to verify it against the values in the correspodent hw.

I think that's one part of what's going in the bug, but I guess just for a different phy.

BR,
Jani.

Quoted 25 lines

Stan

Quoted 22 lines
Quoted 19 lines
---
 drivers/gpu/drm/i915/display/intel_display.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -1
index 43d6ba980780..c3e93bdde29d 100644
@@ -4568,7 +4568,6 @@ copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state,
 	saved_state->uapi = slave_crtc_state->uapi;
 	saved_state->scaler_state = slave_crtc_state->scaler_state;
 	saved_state->shared_dpll = slave_crtc_state->shared_dpll;
-	saved_state->dpll_hw_state = slave_crtc_state->dpll_hw_state;
 	saved_state->crc_enabled = slave_crtc_state->crc_enabled;
 
 	intel_crtc_free_hw_state(slave_crtc_state);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#4 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner

In reply to Stanislav Lisovskiy
== Series Details ==

== Series Details ==

Series: drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner
URL : https://patchwork.freedesktop.org/series/119978/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13330 -> Patchwork_119978v1
====================================================

Summary
-------

**FAILURE**

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

If you think the reported changes have nothing to do with the changes introduced in Patchwork_119978v1, 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_119978v1/index.html

Participating hosts (40 -> 39)
------------------------------

Additional (1): fi-kbl-soraka
Missing (2): bat-rpls-2 fi-snb-2520m

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_119978v1:

### IGT changes ###

#### Possible regressions ####

* igt@i915_suspend@basic-s2idle-without-i915:
- bat-rpls-1: [PASS][1] -> [WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13330/bat-rpls-1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-rpls-1/igt@[email protected]

* igt@kms_flip@basic-flip-vs-wf_vblank:
- fi-kbl-soraka: NOTRUN -> [INCOMPLETE][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/fi-kbl-soraka/igt@kms_flip@basic-flip-vs-wf_vblank.html

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/fi-kbl-soraka/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@gt_mocs:
- bat-mtlp-8: [PASS][6] -> [DMESG-FAIL][7] ([i915#7059])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13330/bat-mtlp-8/igt@i915_selftest@live@gt_mocs.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-mtlp-8/igt@i915_selftest@live@gt_mocs.html

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][8] ([i915#1886] / [i915#7913])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@i915_selftest@live@mman:
- bat-rpls-1: [PASS][9] -> [TIMEOUT][10] ([i915#6794] / [i915#7392])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13330/bat-rpls-1/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-rpls-1/igt@i915_selftest@[email protected]

* igt@i915_suspend@basic-s3-without-i915:
- bat-mtlp-8: NOTRUN -> [SKIP][11] ([i915#6645])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-mtlp-8/igt@[email protected]

* igt@kms_chamelium_frames@hdmi-crc-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][12] ([fdo#109271]) +14 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/fi-kbl-soraka/igt@[email protected]

* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-dg2-11: NOTRUN -> [SKIP][13] ([i915#7828])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-dg2-11/igt@[email protected]
- bat-mtlp-8: NOTRUN -> [SKIP][14] ([i915#7828])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-mtlp-8/igt@[email protected]

* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence:
- bat-adlp-9: NOTRUN -> [SKIP][15] ([i915#3546]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-adlp-9/igt@[email protected]

* igt@kms_setmode@basic-clone-single-crtc:
- fi-kbl-soraka: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#4579])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/fi-kbl-soraka/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@hangcheck:
- bat-dg2-11: [ABORT][17] ([i915#7913] / [i915#7979]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13330/bat-dg2-11/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-dg2-11/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@requests:
- bat-mtlp-8: [ABORT][19] ([i915#7982]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13330/bat-mtlp-8/igt@i915_selftest@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-mtlp-8/igt@i915_selftest@[email protected]

#### Warnings ####

* igt@kms_psr@cursor_plane_move:
- bat-rplp-1: [SKIP][21] ([i915#1072]) -> [ABORT][22] ([i915#8434])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13330/bat-rplp-1/igt@kms_psr@cursor_plane_move.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v1/bat-rplp-1/igt@kms_psr@cursor_plane_move.html

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7979]: https://gitlab.freedesktop.org/drm/intel/issues/7979
[i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982
[i915#8434]: https://gitlab.freedesktop.org/drm/intel/issues/8434

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

* Linux: CI_DRM_13330 -> Patchwork_119978v1

CI-20190529: 20190529
CI_DRM_13330: dd3ec2080383e2bf738c6640aca4183997cf2dde @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7353: cacdae5ad7cb92bdc26a79802fcdd244dadccd42 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119978v1: dd3ec2080383e2bf738c6640aca4183997cf2dde @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

49eb7f9e9814 drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner

== Logs ==

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

#5 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner (rev2)

In reply to Stanislav Lisovskiy
== Series Details ==

== Series Details ==

Series: drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner (rev2)
URL : https://patchwork.freedesktop.org/series/119978/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13336 -> Patchwork_119978v2
====================================================

Summary
-------

**FAILURE**

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

If you think the reported changes have nothing to do with the changes introduced in Patchwork_119978v2, 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_119978v2/index.html

Participating hosts (41 -> 41)
------------------------------

Additional (1): fi-kbl-soraka
Missing (1): fi-snb-2520m

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_119978v2:

### IGT changes ###

#### Possible regressions ####

* igt@vgem_basic@unload:
- fi-kbl-soraka: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-kbl-soraka/igt@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-kbl-soraka/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][4] ([i915#5334] / [i915#7872])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][5] ([i915#1886] / [i915#7913])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-jsl-1: NOTRUN -> [SKIP][6] ([i915#7828])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-jsl-1/igt@[email protected]
- fi-bsw-n3050: NOTRUN -> [SKIP][7] ([fdo#109271])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-bsw-n3050/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-kbl-soraka: NOTRUN -> [SKIP][8] ([fdo#109271]) +14 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-kbl-soraka/igt@[email protected]

* igt@kms_psr@primary_page_flip:
- bat-rplp-1: NOTRUN -> [SKIP][9] ([i915#1072]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-rplp-1/igt@kms_psr@primary_page_flip.html

* igt@kms_setmode@basic-clone-single-crtc:
- bat-rplp-1: NOTRUN -> [ABORT][10] ([i915#4579] / [i915#8260] / [i915#8668])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-rplp-1/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#4579])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-kbl-soraka/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@execlists:
- fi-bsw-n3050: [ABORT][12] ([i915#7911] / [i915#7913]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13336/fi-bsw-n3050/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/fi-bsw-n3050/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- bat-jsl-3: [DMESG-FAIL][14] ([i915#5334]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13336/bat-jsl-3/igt@i915_selftest@live@gt_heartbeat.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-jsl-3/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_selftest@live@gt_pm:
- bat-rpls-2: [DMESG-FAIL][16] ([i915#4258] / [i915#7913]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13336/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-rpls-2/igt@i915_selftest@live@gt_pm.html

* igt@i915_selftest@live@migrate:
- bat-jsl-1: [INCOMPLETE][18] -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13336/bat-jsl-1/igt@i915_selftest@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-jsl-1/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@workarounds:
- bat-mtlp-6: [DMESG-FAIL][20] ([i915#6763]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13336/bat-mtlp-6/igt@i915_selftest@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-mtlp-6/igt@i915_selftest@[email protected]

* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1:
- bat-rplp-1: [ABORT][22] ([i915#8442] / [i915#8668]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13336/bat-rplp-1/igt@kms_pipe_crc_basic@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_119978v2/bat-rplp-1/igt@kms_pipe_crc_basic@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6763]: https://gitlab.freedesktop.org/drm/intel/issues/6763
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7872]: https://gitlab.freedesktop.org/drm/intel/issues/7872
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260
[i915#8442]: https://gitlab.freedesktop.org/drm/intel/issues/8442
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668

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

* Linux: CI_DRM_13336 -> Patchwork_119978v2

CI-20190529: 20190529
CI_DRM_13336: 1423126050a5bb0317e86e61395e4413e0ad013b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7356: 66452bb0118e8d3a78d054cef50a60a9858a00a9 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_119978v2: 1423126050a5bb0317e86e61395e4413e0ad013b @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

10a4db22eaec drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner

== Logs ==

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

Reviewed-by on v1 1/1
#6 lore raw
In reply to Stanislav Lisovskiy
Quoted 2 lines · Stanislav Lisovskiy

If we are using Bigjoiner dpll_hw_state is supposed to be exactly same as for master crtc, so no need to save it's state for slave crtc.

Yeah, and the master has recalculated this already. I guess this used to make some sense in the times when we did the dpll calculations much later.

So probably deserves a

Fixes 0ff0e219d9b8 ("drm/i915: Compute clocks earlier")

Anyways,

Quoted 11 lines
---
 drivers/gpu/drm/i915/display/intel_display.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -0
index 43d6ba980780..c3e93bdde29d 100644

drivers/gpu/drm/i915/display/intel_display.c copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state, · line 4571

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_display.c +0 -1
@@ -4568,7 +4568,6 @@ copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state,
 	saved_state->uapi = slave_crtc_state->uapi;
 	saved_state->scaler_state = slave_crtc_state->scaler_state;
 	saved_state->shared_dpll = slave_crtc_state->shared_dpll;
-	saved_state->dpll_hw_state = slave_crtc_state->dpll_hw_state;

Seems like we should also remove it from the intel_crtc_prepare_cleared_state() but that one clearly needs much more thought due to the port_dpll[] stuff...

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +0 -0
 	saved_state->crc_enabled = slave_crtc_state->crc_enabled;
 
 	intel_crtc_free_hw_state(slave_crtc_state);
Signature · 1 line
2.37.3
Signature · 2 lines
Ville Syrjälä
Intel