drm/i915: Fix assert_plane() warning on bootup with external display
Subsystems (2)
RFC 1/1 drm/i915: Fix assert_plane() warning on bootup with external display
On KBL, WHL RVPs, booting up with an external display connected, triggers below warning. This warning is not seen during hotplug.
[ 3.615226] ------------[ cut here ]------------ [ 3.619829] plane 1A assertion failure (expected on, current off) [ 3.632039] WARNING: CPU: 2 PID: 354 at drivers/gpu/drm/i915/intel_display.c:1294 assert_plane+0x71/0xbb [ 3.633920] iwlwifi 0000:00:14.3: loaded firmware version 38.c0e03d94.0 op_mode iwlmvm [ 3.647157] Modules linked in: iwlwifi cfg80211 btusb btrtl btbcm btintel bluetooth ecdh_generic [ 3.647163] CPU: 2 PID: 354 Comm: frecon Not tainted 4.17.0-rc7-50176-g655af12d39c2 #3 [ 3.647165] Hardware name: Intel Corporation CoffeeLake Client Platform/WhiskeyLake U DDR4 ERB, BIOS CNLSFWR1.R00.X140.B00.1804040304 04/04/2018 [ 3.684509] RIP: 0010:assert_plane+0x71/0xbb [ 3.764451] Call Trace: [ 3.766888] intel_atomic_commit_tail+0xa97/0xb77 [ 3.771569] intel_atomic_commit+0x26a/0x279 [ 3.771572] drm_atomic_helper_set_config+0x5c/0x76 [ 3.780670] __drm_mode_set_config_internal+0x66/0x109 [ 3.780672] drm_mode_setcrtc+0x4c9/0x5cc [ 3.780674] ? drm_mode_getcrtc+0x162/0x162 [ 3.789774] ? drm_mode_getcrtc+0x162/0x162 [ 3.798108] drm_ioctl_kernel+0x8d/0xe4 [ 3.801926] drm_ioctl+0x27d/0x368 [ 3.805311] ? drm_mode_getcrtc+0x162/0x162 [ 3.805314] ? selinux_file_ioctl+0x14e/0x199 [ 3.805317] vfs_ioctl+0x21/0x2f [ 3.813812] do_vfs_ioctl+0x491/0x4b4 [ 3.813813] ? security_file_ioctl+0x37/0x4b [ 3.813816] ksys_ioctl+0x55/0x75 [ 3.820672] __x64_sys_ioctl+0x1a/0x1e [ 3.820674] do_syscall_64+0x51/0x5f [ 3.820678] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 3.828221] RIP: 0033:0x7b5e04953967 [ 3.835504] RSP: 002b:00007fff2eafb6f8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 3.835505] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007b5e04953967 [ 3.835505] RDX: 00007fff2eafb730 RSI: 00000000c06864a2 RDI: 000000000000000f [ 3.835506] RBP: 00007fff2eafb720 R08: 0000000000000000 R09: 0000000000000000 [ 3.835507] R10: 0000000000000070 R11: 0000000000000246 R12: 000000000000000f [ 3.879988] R13: 000056bc9dd7d210 R14: 00007fff2eafb730 R15: 00000000c06864a2 [ 3.887081] Code: 48 c7 c7 06 71 a5 be 84 c0 48 c7 c2 06 fd a3 be 48 89 f9 48 0f 44 ca 84 db 48 0f 45 d7 48 c7 c7 df d3 a4 be 31 c0 e8 af a0 c0 ff <0f> 0b eb 2b 48 c7 c7 06 fd a3 be 84 c0 48 c7 c2 06 71 a5 be 48 [ 3.905845] WARNING: CPU: 2 PID: 354 at drivers/gpu/drm/i915/intel_display.c:1294 assert_plane+0x71/0xbb [ 3.920964] ---[ end trace dac692f4ac46391a ]---
The warning is seen when mode_setcrtc() is called for pipeB during bootup and before we get a mode_setcrtc() for pipeA, while doing update_crtcs() in intel_atomic_commit_tail(). Now since, plane1A is still active after commit, update_crtcs() is done for pipeA and eventually update_plane() for plane1A.
intel_plane_state->ctl for plane1A is not updated since set_modecrtc() is called for pipeB. So intel_plane_state->ctl for plane 1A will be 0x0. So doing an update_plane() for plane1A, will result in clearing PLANE_CTL_ENABLE bit, and hence the warning.
To fix this warning, prior to updating the PLANE_CTL register with intel_plane_state->ctl value, read PLANE_CTL register, OR it with intel_plane_state->ctl and then write it to PLANE_CTL register instead of just relying on intel_plane_state->ctl value.
--- drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_sprite.c +3 -0
@@ -254,6 +254,7 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 val;/* Sizes are 0 based */ src_w--;
@@ -322,6 +323,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)I915_WRITE_FW (PLANE_POS (pipe, plane_id), (crtc_y <<16 ) | crtc_x); } + val =I915_READ_FW (PLANE_CTL (pipe, plane_id)); + plane_ctl |= val;I915_WRITE_FW (PLANE_CTL (pipe, plane_id), plane_ctl);I915_WRITE_FW (PLANE_SURF (pipe, plane_id),intel_plane_ggtt_offset (plane_state) + surf_addr);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Fix assert_plane() warning on bootup with external display
== Series Details ==
== Series Details ==
Series: drm/i915: Fix assert_plane() warning on bootup with external display
URL : https://patchwork.freedesktop.org/series/44909/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4331 -> Patchwork_9344 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9344 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9344, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44909/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9344:
=== IGT changes ===
==== Possible regressions ====
igt@pm_backlight@basic-brightness:
fi-cnl-psr: PASS -> DMESG-WARN== Known issues ==
Here are the changes found in Patchwork_9344 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_gttfill@basic:
fi-byt-n2820: PASS -> FAIL (fdo#106744)
igt@kms_flip@basic-flip-vs-dpms:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106097) +1
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: PASS -> INCOMPLETE (fdo#103713)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-bxt-dsi: NOTRUN -> INCOMPLETE (fdo#103927)
==== Possible fixes ====
igt@gem_ringfill@basic-default-hang:
fi-elk-e7500: DMESG-WARN -> PASS
igt@kms_chamelium@dp-crc-fast:
fi-kbl-7500u: DMESG-FAIL (fdo#103841) -> PASS
igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
fi-glk-j4005: FAIL (fdo#106765) -> PASS fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#106744 https://bugs.freedesktop.org/show_bug.cgi?id=106744
fdo#106765 https://bugs.freedesktop.org/show_bug.cgi?id=106765
== Participating hosts (41 -> 35) ==
Additional (1): fi-bxt-dsi
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-ilk-650 fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_4331 -> Patchwork_9344
CI_DRM_4331: e47233f783ee68a864c2a10216735aca62d642da @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4522: 077c6f7c3786334c5e5c34888ab446fdb4347331 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9344: ff8437bc0ea867a61d3c5ee8c73a0eec6335df4d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ff8437bc0ea8 drm/i915: Fix assert_plane() warning on bootup with external display
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9344/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 75 lines · Azhar Shaikh
On KBL, WHL RVPs, booting up with an external display connected, triggers below warning. This warning is not seen during hotplug.
[ 3.615226] ------------[ cut here ]------------ [ 3.619829] plane 1A assertion failure (expected on, current off) [ 3.632039] WARNING: CPU: 2 PID: 354 at drivers/gpu/drm/i915/intel_display.c:1294 assert_plane+0x71/0xbb [ 3.633920] iwlwifi 0000:00:14.3: loaded firmware version 38.c0e03d94.0 op_mode iwlmvm [ 3.647157] Modules linked in: iwlwifi cfg80211 btusb btrtl btbcm btintel bluetooth ecdh_generic [ 3.647163] CPU: 2 PID: 354 Comm: frecon Not tainted 4.17.0-rc7-50176-g655af12d39c2 #3 [ 3.647165] Hardware name: Intel Corporation CoffeeLake Client Platform/WhiskeyLake U DDR4 ERB, BIOS CNLSFWR1.R00.X140.B00.1804040304 04/04/2018 [ 3.684509] RIP: 0010:assert_plane+0x71/0xbb [ 3.764451] Call Trace: [ 3.766888] intel_atomic_commit_tail+0xa97/0xb77 [ 3.771569] intel_atomic_commit+0x26a/0x279 [ 3.771572] drm_atomic_helper_set_config+0x5c/0x76 [ 3.780670] __drm_mode_set_config_internal+0x66/0x109 [ 3.780672] drm_mode_setcrtc+0x4c9/0x5cc [ 3.780674] ? drm_mode_getcrtc+0x162/0x162 [ 3.789774] ? drm_mode_getcrtc+0x162/0x162 [ 3.798108] drm_ioctl_kernel+0x8d/0xe4 [ 3.801926] drm_ioctl+0x27d/0x368 [ 3.805311] ? drm_mode_getcrtc+0x162/0x162 [ 3.805314] ? selinux_file_ioctl+0x14e/0x199 [ 3.805317] vfs_ioctl+0x21/0x2f [ 3.813812] do_vfs_ioctl+0x491/0x4b4 [ 3.813813] ? security_file_ioctl+0x37/0x4b [ 3.813816] ksys_ioctl+0x55/0x75 [ 3.820672] __x64_sys_ioctl+0x1a/0x1e [ 3.820674] do_syscall_64+0x51/0x5f [ 3.820678] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 3.828221] RIP: 0033:0x7b5e04953967 [ 3.835504] RSP: 002b:00007fff2eafb6f8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 3.835505] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007b5e04953967 [ 3.835505] RDX: 00007fff2eafb730 RSI: 00000000c06864a2 RDI: 000000000000000f [ 3.835506] RBP: 00007fff2eafb720 R08: 0000000000000000 R09: 0000000000000000 [ 3.835507] R10: 0000000000000070 R11: 0000000000000246 R12: 000000000000000f [ 3.879988] R13: 000056bc9dd7d210 R14: 00007fff2eafb730 R15: 00000000c06864a2 [ 3.887081] Code: 48 c7 c7 06 71 a5 be 84 c0 48 c7 c2 06 fd a3 be 48 89 f9 48 0f 44 ca 84 db 48 0f 45 d7 48 c7 c7 df d3 a4 be 31 c0 e8 af a0 c0 ff <0f> 0b eb 2b 48 c7 c7 06 fd a3 be 84 c0 48 c7 c2 06 71 a5 be 48 [ 3.905845] WARNING: CPU: 2 PID: 354 at drivers/gpu/drm/i915/intel_display.c:1294 assert_plane+0x71/0xbb [ 3.920964] ---[ end trace dac692f4ac46391a ]---The warning is seen when
mode_setcrtc()is called for pipeB during bootup and before we get amode_setcrtc()for pipeA, while doingupdate_crtcs()inintel_atomic_commit_tail(). Now since, plane1A is still active after commit,update_crtcs()is done for pipeA and eventuallyupdate_plane()for plane1A.
intel_plane_state->ctlfor plane1A is not updated sinceset_modecrtc()is called for pipeB. Sointel_plane_state->ctlfor plane 1A will be0x0. So doing anupdate_plane()for plane1A, will result in clearingPLANE_CTL_ENABLEbit, and hence the warning.To fix this warning, prior to updating the
PLANE_CTLregister withintel_plane_state->ctlvalue, readPLANE_CTLregister, OR it withintel_plane_state->ctland then write it toPLANE_CTLregister instead of just relying onintel_plane_state->ctlvalue.Signed-off-by Azhar Shaikh <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -254,6 +254,7 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 val;/* Sizes are 0 based */ src_w--;
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) · line 327
Quoted 5 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0@@ -322,6 +323,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)I915_WRITE_FW (PLANE_POS (pipe, plane_id), (crtc_y <<16 ) | crtc_x); } + val =I915_READ_FW (PLANE_CTL (pipe, plane_id)); + plane_ctl |= val;
You get the warning backtrace from our state checker, the purpose of which is to ensure that our software state and hardware state match. This change defeats the purpose of the state checker by relying on the hardware state using a read-modify-write. The states will be out of sync and we won't even know.
The real fix, I think at least before I grab another cup of desperately needed coffee, is to fix the state readout during probe.
BR,
Jani.
Quoted 3 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0I915_WRITE_FW (PLANE_CTL (pipe, plane_id), plane_ctl);I915_WRITE_FW (PLANE_SURF (pipe, plane_id),intel_plane_ggtt_offset (plane_state) + surf_addr);
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 88 lines · Jani Nikula
Quoted 75 lines · Azhar Shaikh
On KBL, WHL RVPs, booting up with an external display connected, triggers below warning. This warning is not seen during hotplug.
[ 3.615226] ------------[ cut here ]------------ [ 3.619829] plane 1A assertion failure (expected on, current off) [ 3.632039] WARNING: CPU: 2 PID: 354 at drivers/gpu/drm/i915/intel_display.c:1294 assert_plane+0x71/0xbb [ 3.633920] iwlwifi 0000:00:14.3: loaded firmware version 38.c0e03d94.0 op_mode iwlmvm [ 3.647157] Modules linked in: iwlwifi cfg80211 btusb btrtl btbcm btintel bluetooth ecdh_generic [ 3.647163] CPU: 2 PID: 354 Comm: frecon Not tainted 4.17.0-rc7-50176-g655af12d39c2 #3 [ 3.647165] Hardware name: Intel Corporation CoffeeLake Client Platform/WhiskeyLake U DDR4 ERB, BIOS CNLSFWR1.R00.X140.B00.1804040304 04/04/2018 [ 3.684509] RIP: 0010:assert_plane+0x71/0xbb [ 3.764451] Call Trace: [ 3.766888] intel_atomic_commit_tail+0xa97/0xb77 [ 3.771569] intel_atomic_commit+0x26a/0x279 [ 3.771572] drm_atomic_helper_set_config+0x5c/0x76 [ 3.780670] __drm_mode_set_config_internal+0x66/0x109 [ 3.780672] drm_mode_setcrtc+0x4c9/0x5cc [ 3.780674] ? drm_mode_getcrtc+0x162/0x162 [ 3.789774] ? drm_mode_getcrtc+0x162/0x162 [ 3.798108] drm_ioctl_kernel+0x8d/0xe4 [ 3.801926] drm_ioctl+0x27d/0x368 [ 3.805311] ? drm_mode_getcrtc+0x162/0x162 [ 3.805314] ? selinux_file_ioctl+0x14e/0x199 [ 3.805317] vfs_ioctl+0x21/0x2f [ 3.813812] do_vfs_ioctl+0x491/0x4b4 [ 3.813813] ? security_file_ioctl+0x37/0x4b [ 3.813816] ksys_ioctl+0x55/0x75 [ 3.820672] __x64_sys_ioctl+0x1a/0x1e [ 3.820674] do_syscall_64+0x51/0x5f [ 3.820678] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 3.828221] RIP: 0033:0x7b5e04953967 [ 3.835504] RSP: 002b:00007fff2eafb6f8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 3.835505] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007b5e04953967 [ 3.835505] RDX: 00007fff2eafb730 RSI: 00000000c06864a2 RDI: 000000000000000f [ 3.835506] RBP: 00007fff2eafb720 R08: 0000000000000000 R09: 0000000000000000 [ 3.835507] R10: 0000000000000070 R11: 0000000000000246 R12: 000000000000000f [ 3.879988] R13: 000056bc9dd7d210 R14: 00007fff2eafb730 R15: 00000000c06864a2 [ 3.887081] Code: 48 c7 c7 06 71 a5 be 84 c0 48 c7 c2 06 fd a3 be 48 89 f9 48 0f 44 ca 84 db 48 0f 45 d7 48 c7 c7 df d3 a4 be 31 c0 e8 af a0 c0 ff <0f> 0b eb 2b 48 c7 c7 06 fd a3 be 84 c0 48 c7 c2 06 71 a5 be 48 [ 3.905845] WARNING: CPU: 2 PID: 354 at drivers/gpu/drm/i915/intel_display.c:1294 assert_plane+0x71/0xbb [ 3.920964] ---[ end trace dac692f4ac46391a ]---The warning is seen when
mode_setcrtc()is called for pipeB during bootup and before we get amode_setcrtc()for pipeA, while doingupdate_crtcs()inintel_atomic_commit_tail(). Now since, plane1A is still active after commit,update_crtcs()is done for pipeA and eventuallyupdate_plane()for plane1A.
intel_plane_state->ctlfor plane1A is not updated sinceset_modecrtc()is called for pipeB. Sointel_plane_state->ctlfor plane 1A will be0x0. So doing anupdate_plane()for plane1A, will result in clearingPLANE_CTL_ENABLEbit, and hence the warning.To fix this warning, prior to updating the
PLANE_CTLregister withintel_plane_state->ctlvalue, readPLANE_CTLregister, OR it withintel_plane_state->ctland then write it toPLANE_CTLregister instead of just relying onintel_plane_state->ctlvalue.Signed-off-by Azhar Shaikh <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_sprite.c +1
-0@@ -254,6 +254,7 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 val;/* Sizes are 0 based */ src_w--;drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) · line 327
Quoted 5 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0@@ -322,6 +323,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)I915_WRITE_FW (PLANE_POS (pipe, plane_id), (crtc_y <<16 ) | crtc_x); } + val =I915_READ_FW (PLANE_CTL (pipe, plane_id)); + plane_ctl |= val;You get the warning backtrace from our state checker, the purpose of which is to ensure that our software state and hardware state match. This change defeats the purpose of the state checker by relying on the hardware state using a read-modify-write. The states will be out of sync and we won't even know.
Quoted 2 lines
The real fix, I think at least before I grab another cup of desperately needed coffee, is to fix the state readout during probe.
Full plane state readout would require a bit of work. Would be nice to have indeed, but probably quicker to just force all planes to recompute their states. I'm thinking that should be happening already, but maybe I'm mistaken.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 122 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, June 18, 2018 4:57 AM
To: Jani Nikula <[email protected]>
Cc: Shaikh, Azhar <[email protected]>; [email protected]
Subject: Re: [Intel-gfx] [RFC] drm/i915: Fixassert_plane()warning on bootup with external displayQuoted 7 lines · Jani Nikula
Quoted 6 lines · Azhar Shaikh
On KBL, WHL RVPs, booting up with an external display connected, triggers below warning. This warning is not seen during hotplug.
[ 3.615226] ------------[ cut here ]------------ [ 3.619829] plane 1A assertion failure (expected on, current off) [ 3.632039] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 1 line
Quoted 1 line
[ 3.633920] iwlwifi 0000:00:14.3: loaded firmware version 38.c0e03d94.0
op_modeiwlmvmQuoted 1 line
Quoted 1 line
[ 3.647157] Modules linked in: iwlwifi cfg80211 btusb btrtl btbcm btintelbluetooth
ecdh_genericQuoted 1 line
Quoted 1 line
[ 3.647163] CPU: 2 PID: 354 Comm: frecon Not tainted 4.17.0-rc7-50176-g655af12d39c2 #3
Quoted 1 line
Quoted 1 line
[ 3.647165] Hardware name: Intel Corporation CoffeeLake ClientPlatform/WhiskeyLake U DDR4 ERB, BIOS
CNLSFWR1.R00.X140.B00.1804040304 04/04/2018Quoted 14 lines
Quoted 14 lines
[ 3.684509] RIP: 0010:assert_plane+0x71/0xbb [ 3.764451] Call Trace: [ 3.766888] intel_atomic_commit_tail+0xa97/0xb77 [ 3.771569] intel_atomic_commit+0x26a/0x279 [ 3.771572] drm_atomic_helper_set_config+0x5c/0x76 [ 3.780670] __drm_mode_set_config_internal+0x66/0x109 [ 3.780672] drm_mode_setcrtc+0x4c9/0x5cc [ 3.780674] ? drm_mode_getcrtc+0x162/0x162 [ 3.789774] ? drm_mode_getcrtc+0x162/0x162 [ 3.798108] drm_ioctl_kernel+0x8d/0xe4 [ 3.801926] drm_ioctl+0x27d/0x368 [ 3.805311] ? drm_mode_getcrtc+0x162/0x162 [ 3.805314] ? selinux_file_ioctl+0x14e/0x199 [ 3.805317] vfs_ioctl+0x21/0x2fQuoted 8 lines
Quoted 8 lines
[ 3.813812] do_vfs_ioctl+0x491/0x4b4 [ 3.813813] ? security_file_ioctl+0x37/0x4b [ 3.813816] ksys_ioctl+0x55/0x75 [ 3.820672] __x64_sys_ioctl+0x1a/0x1e [ 3.820674] do_syscall_64+0x51/0x5f [ 3.820678] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 3.828221] RIP: 0033:0x7b5e04953967 [ 3.835504] RSP: 002b:00007fff2eafb6f8 EFLAGS: 00000246 ORIG_RAX:0000000000000010
Quoted 1 line
Quoted 1 line
[ 3.835505] RAX: ffffffffffffffda RBX: 0000000000000002 RCX:
00007b5e04953967Quoted 1 line
Quoted 1 line
[ 3.835505] RDX: 00007fff2eafb730 RSI: 00000000c06864a2 RDI:
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.835506] RBP: 00007fff2eafb720 R08: 0000000000000000 R09:0000000000000000
Quoted 1 line
Quoted 1 line
[ 3.835507] R10: 0000000000000070 R11: 0000000000000246 R12:
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.879988] R13: 000056bc9dd7d210 R14: 00007fff2eafb730 R15:
00000000c06864a2Quoted 1 line
Quoted 1 line
[ 3.887081] Code: 48 c7 c7 06 71 a5 be 84 c0 48 c7 c2 06 fd a3 be 48 89 f9 480f 44 ca 84 db 48 0f 45 d7 48 c7 c7 df d3 a4 be 31 c0 e8 af a0 c0 ff <0f> 0b eb 2b 48 c7 c7 06 fd a3 be 84 c0 48 c7 c2 06 71 a5 be 48
Quoted 1 line
Quoted 1 line
[ 3.905845] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 10 lines
Quoted 10 lines
[ 3.920964] ---[ end trace dac692f4ac46391a ]---The warning is seen when
mode_setcrtc()is called for pipeB during bootup and before we get amode_setcrtc()for pipeA, while doingupdate_crtcs()inintel_atomic_commit_tail().
Now since, plane1A is still active after commit,update_crtcs()is done for pipeA and eventuallyupdate_plane()for plane1A.
intel_plane_state->ctlfor plane1A is not updated sinceset_modecrtc()is called for pipeB. Sointel_plane_state->ctlfor plane 1Awill be
0x0.Quoted 13 lines
Quoted 13 lines
So doing an
update_plane()for plane1A, will result in clearingPLANE_CTL_ENABLEbit, and hence the warning.To fix this warning, prior to updating the
PLANE_CTLregister withintel_plane_state->ctlvalue, readPLANE_CTLregister, OR it withintel_plane_state->ctland then write it toPLANE_CTLregister instead of just relying onintel_plane_state->ctlvalue.Signed-off-by Azhar Shaikh <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 1 file changed, 3 insertions(+)Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -254,6 +254,7 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 val;/* Sizes are 0 based */ src_w--;@@ -322,6 +323,8 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct · line 323
Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c +0
-0I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) |
crtc_x);Quoted 11 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) · line 327
Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0} + val =I915_READ_FW (PLANE_CTL (pipe, plane_id)); + plane_ctl |= val;You get the warning backtrace from our state checker, the purpose of which is to ensure that our software state and hardware state match. This change defeats the purpose of the state checker by relying on the hardware state using a read-modify-write. The states will be out of sync and we won't even know.
Quoted 2 lines
The real fix, I think at least before I grab another cup of desperately needed coffee, is to fix the state readout during probe.
Quoted 6 lines
Full plane state readout would require a bit of work. Would be nice to have indeed, but probably quicker to just force all planes to recompute their states. I'm thinking that should be happening already, but maybe I'm mistaken.
force all planes to recompute their states
All planes on all pipes need to recompute or only the pipe which is in modeset? Also recompute the sw state, is that right?
In this case pipeB is the only one which is doing a modeset and after commit, pipeB is not active. Its only pipeA is active when the warning is seen.
Quoted 3 lines
--
Ville Syrjälä
Intel
Regards,
Azhar Shaikh
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 122 lines · Azhar
Quoted 122 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, June 18, 2018 4:57 AM
To: Jani Nikula <[email protected]>
Cc: Shaikh, Azhar <[email protected]>; [email protected]
Subject: Re: [Intel-gfx] [RFC] drm/i915: Fixassert_plane()warning on bootup with external displayQuoted 7 lines · Jani Nikula
Quoted 6 lines · Azhar Shaikh
On KBL, WHL RVPs, booting up with an external display connected, triggers below warning. This warning is not seen during hotplug.
[ 3.615226] ------------[ cut here ]------------ [ 3.619829] plane 1A assertion failure (expected on, current off) [ 3.632039] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 1 line
Quoted 1 line
[ 3.633920] iwlwifi 0000:00:14.3: loaded firmware version 38.c0e03d94.0
op_modeiwlmvmQuoted 1 line
Quoted 1 line
[ 3.647157] Modules linked in: iwlwifi cfg80211 btusb btrtl btbcm btintelbluetooth
ecdh_genericQuoted 1 line
Quoted 1 line
[ 3.647163] CPU: 2 PID: 354 Comm: frecon Not tainted 4.17.0-rc7-50176-g655af12d39c2 #3
Quoted 1 line
Quoted 1 line
[ 3.647165] Hardware name: Intel Corporation CoffeeLake ClientPlatform/WhiskeyLake U DDR4 ERB, BIOS
CNLSFWR1.R00.X140.B00.1804040304 04/04/2018Quoted 14 lines
Quoted 14 lines
[ 3.684509] RIP: 0010:assert_plane+0x71/0xbb [ 3.764451] Call Trace: [ 3.766888] intel_atomic_commit_tail+0xa97/0xb77 [ 3.771569] intel_atomic_commit+0x26a/0x279 [ 3.771572] drm_atomic_helper_set_config+0x5c/0x76 [ 3.780670] __drm_mode_set_config_internal+0x66/0x109 [ 3.780672] drm_mode_setcrtc+0x4c9/0x5cc [ 3.780674] ? drm_mode_getcrtc+0x162/0x162 [ 3.789774] ? drm_mode_getcrtc+0x162/0x162 [ 3.798108] drm_ioctl_kernel+0x8d/0xe4 [ 3.801926] drm_ioctl+0x27d/0x368 [ 3.805311] ? drm_mode_getcrtc+0x162/0x162 [ 3.805314] ? selinux_file_ioctl+0x14e/0x199 [ 3.805317] vfs_ioctl+0x21/0x2fQuoted 8 lines
Quoted 8 lines
[ 3.813812] do_vfs_ioctl+0x491/0x4b4 [ 3.813813] ? security_file_ioctl+0x37/0x4b [ 3.813816] ksys_ioctl+0x55/0x75 [ 3.820672] __x64_sys_ioctl+0x1a/0x1e [ 3.820674] do_syscall_64+0x51/0x5f [ 3.820678] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 3.828221] RIP: 0033:0x7b5e04953967 [ 3.835504] RSP: 002b:00007fff2eafb6f8 EFLAGS: 00000246 ORIG_RAX:0000000000000010
Quoted 1 line
Quoted 1 line
[ 3.835505] RAX: ffffffffffffffda RBX: 0000000000000002 RCX:
00007b5e04953967Quoted 1 line
Quoted 1 line
[ 3.835505] RDX: 00007fff2eafb730 RSI: 00000000c06864a2 RDI:
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.835506] RBP: 00007fff2eafb720 R08: 0000000000000000 R09:0000000000000000
Quoted 1 line
Quoted 1 line
[ 3.835507] R10: 0000000000000070 R11: 0000000000000246 R12:
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.879988] R13: 000056bc9dd7d210 R14: 00007fff2eafb730 R15:
00000000c06864a2Quoted 1 line
Quoted 1 line
[ 3.887081] Code: 48 c7 c7 06 71 a5 be 84 c0 48 c7 c2 06 fd a3 be 48 89 f9 480f 44 ca 84 db 48 0f 45 d7 48 c7 c7 df d3 a4 be 31 c0 e8 af a0 c0 ff <0f> 0b eb 2b 48 c7 c7 06 fd a3 be 84 c0 48 c7 c2 06 71 a5 be 48
Quoted 1 line
Quoted 1 line
[ 3.905845] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 10 lines
Quoted 10 lines
[ 3.920964] ---[ end trace dac692f4ac46391a ]---The warning is seen when
mode_setcrtc()is called for pipeB during bootup and before we get amode_setcrtc()for pipeA, while doingupdate_crtcs()inintel_atomic_commit_tail().
Now since, plane1A is still active after commit,update_crtcs()is done for pipeA and eventuallyupdate_plane()for plane1A.
intel_plane_state->ctlfor plane1A is not updated sinceset_modecrtc()is called for pipeB. Sointel_plane_state->ctlfor plane 1Awill be
0x0.Quoted 13 lines
Quoted 13 lines
So doing an
update_plane()for plane1A, will result in clearingPLANE_CTL_ENABLEbit, and hence the warning.To fix this warning, prior to updating the
PLANE_CTLregister withintel_plane_state->ctlvalue, readPLANE_CTLregister, OR it withintel_plane_state->ctland then write it toPLANE_CTLregister instead of just relying onintel_plane_state->ctlvalue.Signed-off-by Azhar Shaikh <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 1 file changed, 3 insertions(+)Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -254,6 +254,7 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 val;/* Sizes are 0 based */ src_w--;@@ -322,6 +323,8 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct · line 323
Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c +0
-0I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) |
crtc_x);Quoted 13 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) · line 327
Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0} + val =I915_READ_FW (PLANE_CTL (pipe, plane_id)); + plane_ctl |= val;You get the warning backtrace from our state checker, the purpose of which is to ensure that our software state and hardware state match. This change defeats the purpose of the state checker by relying on the hardware state using a read-modify-write. The states will be out of sync and we won't even know.
The real fix, I think at least before I grab another cup of desperately needed coffee, is to fix the state readout during probe.
Quoted 8 lines
Quoted 6 lines
Full plane state readout would require a bit of work. Would be nice to have indeed, but probably quicker to just force all planes to recompute their states. I'm thinking that should be happening already, but maybe I'm mistaken.
force all planes to recompute their states
All planes on all pipes need to recompute or only the pipe which is in modeset?
Any active pipe taking part in the commit that hasn't had its state fully recomputed yet.
Hmm. I915_MODE_FLAG_INHERITED should force this on the first commit. But apparently that's not happening in your case. We need to figure out why that is.
Quoted 1 line
Also recompute the sw state, is that right?
What else is there?
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 147 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, June 19, 2018 5:00 AM
To: Shaikh, Azhar <[email protected]>
Cc: Jani Nikula <[email protected]>; [email protected]
Subject: Re: [Intel-gfx] [RFC] drm/i915: Fixassert_plane()warning on bootup with external displayQuoted 13 lines · Azhar
Quoted 13 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, June 18, 2018 4:57 AM
To: Jani Nikula <[email protected]>
Cc: Shaikh, Azhar <[email protected]>; [email protected]
Subject: Re: [Intel-gfx] [RFC] drm/i915: Fixassert_plane()warning on bootup with external displayQuoted 1 line · Jani Nikula
On Sun, 17 Jun 2018, Azhar Shaikh <[email protected]> wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
On KBL, WHL RVPs, booting up with an external display connected, triggers below warning. This warning is not seen during hotplug.
[ 3.615226] ------------[ cut here ]------------ [ 3.619829] plane 1A assertion failure (expected on, current off) [ 3.632039] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 1 line
Quoted 1 line
[ 3.633920] iwlwifi 0000:00:14.3: loaded firmware version38.c0e03d94.0
Quoted 2 lines
Quoted 2 lines
op_modeiwlmvmQuoted 1 line
Quoted 1 line
[ 3.647157] Modules linked in: iwlwifi cfg80211 btusb btrtl btbcmbtintel
Quoted 2 lines
Quoted 2 lines
bluetooth
ecdh_genericQuoted 1 line
Quoted 1 line
[ 3.647163] CPU: 2 PID: 354 Comm: frecon Not tainted 4.17.0-rc7-50176-
Quoted 30 lines
Quoted 30 lines
g655af12d39c2 #3
Quoted 1 line
Quoted 1 line
[ 3.647165] Hardware name: Intel Corporation CoffeeLake ClientPlatform/WhiskeyLake U DDR4 ERB, BIOS
CNLSFWR1.R00.X140.B00.1804040304 04/04/2018Quoted 14 lines
Quoted 14 lines
[ 3.684509] RIP: 0010:assert_plane+0x71/0xbb [ 3.764451] Call Trace: [ 3.766888] intel_atomic_commit_tail+0xa97/0xb77 [ 3.771569] intel_atomic_commit+0x26a/0x279 [ 3.771572] drm_atomic_helper_set_config+0x5c/0x76 [ 3.780670] __drm_mode_set_config_internal+0x66/0x109 [ 3.780672] drm_mode_setcrtc+0x4c9/0x5cc [ 3.780674] ? drm_mode_getcrtc+0x162/0x162 [ 3.789774] ? drm_mode_getcrtc+0x162/0x162 [ 3.798108] drm_ioctl_kernel+0x8d/0xe4 [ 3.801926] drm_ioctl+0x27d/0x368 [ 3.805311] ? drm_mode_getcrtc+0x162/0x162 [ 3.805314] ? selinux_file_ioctl+0x14e/0x199 [ 3.805317] vfs_ioctl+0x21/0x2fQuoted 8 lines
Quoted 8 lines
[ 3.813812] do_vfs_ioctl+0x491/0x4b4 [ 3.813813] ? security_file_ioctl+0x37/0x4b [ 3.813816] ksys_ioctl+0x55/0x75 [ 3.820672] __x64_sys_ioctl+0x1a/0x1e [ 3.820674] do_syscall_64+0x51/0x5f [ 3.820678] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 3.828221] RIP: 0033:0x7b5e04953967 [ 3.835504] RSP: 002b:00007fff2eafb6f8 EFLAGS: 00000246 ORIG_RAX:0000000000000010
Quoted 1 line
Quoted 1 line
[ 3.835505] RAX: ffffffffffffffda RBX: 0000000000000002 RCX:
00007b5e04953967Quoted 1 line
Quoted 1 line
[ 3.835505] RDX: 00007fff2eafb730 RSI: 00000000c06864a2 RDI:Quoted 8 lines
Quoted 8 lines
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.835506] RBP: 00007fff2eafb720 R08: 0000000000000000 R09:0000000000000000
Quoted 1 line
Quoted 1 line
[ 3.835507] R10: 0000000000000070 R11: 0000000000000246 R12:
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.879988] R13: 000056bc9dd7d210 R14: 00007fff2eafb730 R15:
00000000c06864a2Quoted 1 line
Quoted 1 line
[ 3.887081] Code: 48 c7 c7 06 71 a5 be 84 c0 48 c7 c2 06 fd a3 be 48 89f9 48
Quoted 60 lines
Quoted 60 lines
0f 44 ca 84 db 48 0f 45 d7 48 c7 c7 df d3 a4 be 31 c0 e8 af a0 c0 ff <0f> 0b eb 2b
48 c7 c7 06 fd a3 be 84 c0 48 c7 c2 06 71 a5 be 48Quoted 1 line
Quoted 1 line
[ 3.905845] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 9 lines
Quoted 9 lines
[ 3.920964] ---[ end trace dac692f4ac46391a ]---The warning is seen when
mode_setcrtc()is called for pipeB during bootup and before we get amode_setcrtc()for pipeA, while doingupdate_crtcs()inintel_atomic_commit_tail().
Now since, plane1A is still active after commit,update_crtcs()is done for pipeA and eventuallyupdate_plane()for plane1A.Quoted 3 lines
Quoted 3 lines
intel_plane_state->ctlfor plane1A is not updated sinceset_modecrtc()is called for pipeB. Sointel_plane_state->ctlfor plane 1Awill be
0x0.Quoted 13 lines
Quoted 13 lines
So doing an
update_plane()for plane1A, will result in clearingPLANE_CTL_ENABLEbit, and hence the warning.To fix this warning, prior to updating the
PLANE_CTLregister withintel_plane_state->ctlvalue, readPLANE_CTLregister, OR it withintel_plane_state->ctland then write it toPLANE_CTLregister instead of just relying onintel_plane_state->ctlvalue.Signed-off-by Azhar Shaikh <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 1 file changed, 3 insertions(+)Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -254,6 +254,7 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 val;/* Sizes are 0 based */ src_w--;@@ -322,6 +323,8 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct · line 323
Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c +0
-0I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) |
crtc_x);Quoted 11 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) · line 327
Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0} + val =I915_READ_FW (PLANE_CTL (pipe, plane_id)); + plane_ctl |= val;You get the warning backtrace from our state checker, the purpose of which is to ensure that our software state and hardware state match. This change defeats the purpose of the state checker by relying on the hardware state using a read-modify-write. The states will be out of sync and we won't even know.
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
The real fix, I think at least before I grab another cup of desperately needed coffee, is to fix the state readout during probe.
Full plane state readout would require a bit of work. Would be nice to have indeed, but probably quicker to just force all planes to recompute
their states.
Quoted 3 lines
Quoted 2 lines
I'm thinking that should be happening already, but maybe I'm mistaken.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
force all planes to recompute their states
All planes on all pipes need to recompute or only the pipe which is in
modeset?
Any active pipe taking part in the commit that hasn't had its state fully recomputed yet.
For now I tried readout of PLANE_CTL and PLANE_COLOR_CTL, updating the new_intel_plane_state with these values in intel_pre_plane_update_plane() before calling skl_update_plane(). With this change eDP is corrupted and external display fails to come up.
If I call skl_plane_ctl() before calling skl_update_plane(), I do not see any corruption, no warning and everything "seems" to works fine. So do I need to call skl_plane_ctl() + other values which need to be recomputed from readout HW state and then update the intel_plane_state()?
Also what all values do we need to recompute from HW readout, other than PLANE_CTL and PLANE_COLOR_CTL?
Quoted 11 lines
Hmm.
I915_MODE_FLAG_INHERITEDshould force this on the first commit. But apparently that's not happening in your case. We need to figure out why that is.Quoted 1 line
Also recompute the sw state, is that right?
What else is there?
--
Ville Syrjälä
Intel
Regards,
Azhar Shaikh
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 149 lines · Azhar
Quoted 149 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, June 19, 2018 5:00 AM
To: Shaikh, Azhar <[email protected]>
Cc: Jani Nikula <[email protected]>; [email protected]
Subject: Re: [Intel-gfx] [RFC] drm/i915: Fixassert_plane()warning on bootup with external displayQuoted 13 lines · Azhar
Quoted 13 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, June 18, 2018 4:57 AM
To: Jani Nikula <[email protected]>
Cc: Shaikh, Azhar <[email protected]>; [email protected]
Subject: Re: [Intel-gfx] [RFC] drm/i915: Fixassert_plane()warning on bootup with external displayQuoted 1 line · Jani Nikula
On Sun, 17 Jun 2018, Azhar Shaikh <[email protected]> wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
On KBL, WHL RVPs, booting up with an external display connected, triggers below warning. This warning is not seen during hotplug.
[ 3.615226] ------------[ cut here ]------------ [ 3.619829] plane 1A assertion failure (expected on, current off) [ 3.632039] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 1 line
Quoted 1 line
[ 3.633920] iwlwifi 0000:00:14.3: loaded firmware version38.c0e03d94.0
Quoted 2 lines
Quoted 2 lines
op_modeiwlmvmQuoted 1 line
Quoted 1 line
[ 3.647157] Modules linked in: iwlwifi cfg80211 btusb btrtl btbcmbtintel
Quoted 2 lines
Quoted 2 lines
bluetooth
ecdh_genericQuoted 1 line
Quoted 1 line
[ 3.647163] CPU: 2 PID: 354 Comm: frecon Not tainted 4.17.0-rc7-50176-
Quoted 30 lines
Quoted 30 lines
g655af12d39c2 #3
Quoted 1 line
Quoted 1 line
[ 3.647165] Hardware name: Intel Corporation CoffeeLake ClientPlatform/WhiskeyLake U DDR4 ERB, BIOS
CNLSFWR1.R00.X140.B00.1804040304 04/04/2018Quoted 14 lines
Quoted 14 lines
[ 3.684509] RIP: 0010:assert_plane+0x71/0xbb [ 3.764451] Call Trace: [ 3.766888] intel_atomic_commit_tail+0xa97/0xb77 [ 3.771569] intel_atomic_commit+0x26a/0x279 [ 3.771572] drm_atomic_helper_set_config+0x5c/0x76 [ 3.780670] __drm_mode_set_config_internal+0x66/0x109 [ 3.780672] drm_mode_setcrtc+0x4c9/0x5cc [ 3.780674] ? drm_mode_getcrtc+0x162/0x162 [ 3.789774] ? drm_mode_getcrtc+0x162/0x162 [ 3.798108] drm_ioctl_kernel+0x8d/0xe4 [ 3.801926] drm_ioctl+0x27d/0x368 [ 3.805311] ? drm_mode_getcrtc+0x162/0x162 [ 3.805314] ? selinux_file_ioctl+0x14e/0x199 [ 3.805317] vfs_ioctl+0x21/0x2fQuoted 8 lines
Quoted 8 lines
[ 3.813812] do_vfs_ioctl+0x491/0x4b4 [ 3.813813] ? security_file_ioctl+0x37/0x4b [ 3.813816] ksys_ioctl+0x55/0x75 [ 3.820672] __x64_sys_ioctl+0x1a/0x1e [ 3.820674] do_syscall_64+0x51/0x5f [ 3.820678] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 3.828221] RIP: 0033:0x7b5e04953967 [ 3.835504] RSP: 002b:00007fff2eafb6f8 EFLAGS: 00000246 ORIG_RAX:0000000000000010
Quoted 1 line
Quoted 1 line
[ 3.835505] RAX: ffffffffffffffda RBX: 0000000000000002 RCX:
00007b5e04953967Quoted 1 line
Quoted 1 line
[ 3.835505] RDX: 00007fff2eafb730 RSI: 00000000c06864a2 RDI:Quoted 8 lines
Quoted 8 lines
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.835506] RBP: 00007fff2eafb720 R08: 0000000000000000 R09:0000000000000000
Quoted 1 line
Quoted 1 line
[ 3.835507] R10: 0000000000000070 R11: 0000000000000246 R12:
000000000000000fQuoted 1 line
Quoted 1 line
[ 3.879988] R13: 000056bc9dd7d210 R14: 00007fff2eafb730 R15:
00000000c06864a2Quoted 1 line
Quoted 1 line
[ 3.887081] Code: 48 c7 c7 06 71 a5 be 84 c0 48 c7 c2 06 fd a3 be 48 89f9 48
Quoted 60 lines
Quoted 60 lines
0f 44 ca 84 db 48 0f 45 d7 48 c7 c7 df d3 a4 be 31 c0 e8 af a0 c0 ff <0f> 0b eb 2b
48 c7 c7 06 fd a3 be 84 c0 48 c7 c2 06 71 a5 be 48Quoted 1 line
Quoted 1 line
[ 3.905845] WARNING: CPU: 2 PID: 354 at
drivers/gpu/drm/i915/intel_display.c:1294assert_plane+0x71/0xbbQuoted 9 lines
Quoted 9 lines
[ 3.920964] ---[ end trace dac692f4ac46391a ]---The warning is seen when
mode_setcrtc()is called for pipeB during bootup and before we get amode_setcrtc()for pipeA, while doingupdate_crtcs()inintel_atomic_commit_tail().
Now since, plane1A is still active after commit,update_crtcs()is done for pipeA and eventuallyupdate_plane()for plane1A.Quoted 3 lines
Quoted 3 lines
intel_plane_state->ctlfor plane1A is not updated sinceset_modecrtc()is called for pipeB. Sointel_plane_state->ctlfor plane 1Awill be
0x0.Quoted 13 lines
Quoted 13 lines
So doing an
update_plane()for plane1A, will result in clearingPLANE_CTL_ENABLEbit, and hence the warning.To fix this warning, prior to updating the
PLANE_CTLregister withintel_plane_state->ctlvalue, readPLANE_CTLregister, OR it withintel_plane_state->ctland then write it toPLANE_CTLregister instead of just relying onintel_plane_state->ctlvalue.Signed-off-by Azhar Shaikh <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 3 +++ 1 file changed, 3 insertions(+)Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 6 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -254,6 +254,7 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +1
-0uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 val;/* Sizes are 0 based */ src_w--;@@ -322,6 +323,8 @@ void intel_pipe_update_end(struct
intel_crtc_state*new_crtc_state)Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct · line 323
Quoted 1 line
drivers/gpu/drm/i915/intel_sprite.c +0
-0I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) |
crtc_x);Quoted 11 lines
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) · line 327
Quoted 4 lines
drivers/gpu/drm/i915/intel_sprite.c +2
-0} + val =I915_READ_FW (PLANE_CTL (pipe, plane_id)); + plane_ctl |= val;You get the warning backtrace from our state checker, the purpose of which is to ensure that our software state and hardware state match. This change defeats the purpose of the state checker by relying on the hardware state using a read-modify-write. The states will be out of sync and we won't even know.
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
The real fix, I think at least before I grab another cup of desperately needed coffee, is to fix the state readout during probe.
Full plane state readout would require a bit of work. Would be nice to have indeed, but probably quicker to just force all planes to recompute
their states.
Quoted 5 lines
Quoted 4 lines
I'm thinking that should be happening already, but maybe I'm mistaken.
force all planes to recompute their states
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
All planes on all pipes need to recompute or only the pipe which is in
modeset?
Any active pipe taking part in the commit that hasn't had its state fully recomputed yet.
For now I tried readout of
PLANE_CTLandPLANE_COLOR_CTL, updating thenew_intel_plane_statewith these values inintel_pre_plane_update_plane()before callingskl_update_plane(). With this change eDP is corrupted and external display fails to come up.
The readout should go to the initial_plane_config() thing, which is immplemented in a sort of ass backwards way. Ideally we'd want to do a full plane state readout first, then reconstruct the fb based on that state. Currently we do it basically the other way around.
One thing I was also thinking is that eventually we might want to create some kind of placeholder fb for every enabled plane, even if aren't going to take over that fb later. That way we could use the normal atomic paths to disable all planes we don't want enabled.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx