drm/atomic-helper: always track connector commits, too
Subsystems (3)
PATCH 1/2 drm/atomic-helper: always track connector commits, too
It's useful for syncing async connector work like link retraining.
v2: Make it work (Manasi&Ville)
--- drivers/gpu/drm/drm_atomic_helper.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +3 -9
@@ -1793,11 +1793,8 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, !try_wait_for_completion(&old_conn_state->commit->flip_done))return -EBUSY ; -/* commit tracked through new_crtc_state->commit, no need to do it explicitly */ -if (new_conn_state->crtc) -continue ; - - commit =crtc_or_fake_commit (state, old_conn_state->crtc); +/* Always track connectors explicitly for e.g. link retraining. */ + commit =crtc_or_fake_commit (state, new_conn_state->crtc ?: old_conn_state->crtc);if (!commit)return -ENOMEM ;
@@ -1811,10 +1808,7 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, !try_wait_for_completion(&old_plane_state->commit->flip_done))return -EBUSY ; -/* -* Unlike connectors, always track planes explicitly for -* async pageflip support. -*/ +/* Always track planes explicitly for async pageflip support. */ commit =crtc_or_fake_commit (state, new_plane_state->crtc ?: old_plane_state->crtc);if (!commit)return -ENOMEM ;
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: sync dp link status checks against atomic commmits
Two bits:
- check actual atomic state, the legacy stuff can only be looked at from within the atomic_commit_tail function, since it's only protected by ordering and not by any locks.
- Make sure we don't wreak the work an ongoing nonblocking commit is doing.
v2: We need the crtc lock too, because a plane update might change it without having to acquire the connection_mutex (Maarten). Use Maarten's changes for this locking, while keeping the logic that uses the connection->commit->hw_done signal for syncing with nonblocking commits.
v3: The initial state objects from the hw state readout do not have a commit object. Check for that (spotted by CI).
Cc: Manasi Navare <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Ville Syrjälä <[email protected]>
References: https://bugs.freedesktop.org/show_bug.cgi?id=103336
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99272
--- drivers/gpu/drm/i915/intel_dp.c | 57 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +51 -6
@@ -4319,6 +4319,8 @@ static void intel_dp_check_link_status(struct intel_dp *intel_dp) {struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; +struct drm_connector_state *conn_state = + intel_dp->attached_connector->base.state;struct drm_device *dev =intel_dp_to_dev (intel_dp);u8 link_status[DP_LINK_STATUS_SIZE ];
@@ -4329,10 +4331,16 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)return ; } -if (!intel_encoder->base.crtc) +if (!conn_state->crtc)return ; -if (!to_intel_crtc (intel_encoder->base.crtc)->active) +WARN_ON (!drm_modeset_is_locked (&conn_state->crtc->mutex)); + +if (!conn_state->crtc->state->active) +return ; + +if (conn_state->commit && + !try_wait_for_completion (&conn_state->commit->hw_done))return ;/*
@@ -4368,7 +4376,6 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)static bool intel_dp_short_pulse (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp);struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base;u8 sink_irq_vector =0 ;u8 old_sink_count = intel_dp->sink_count;
@@ -4408,9 +4415,8 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL );intel_dp_check_link_status (intel_dp); -drm_modeset_unlock (&dev->mode_config.connection_mutex); +if (intel_dp->compliance.test_type ==DP_TEST_LINK_TRAINING ) {DRM_DEBUG_KMS ("Link Training Compliance Test requested\n" );/* Send a Hotplug Uevent to userspace to start modeset */
@@ -4860,8 +4866,19 @@ intel_dp_detect(struct drm_connector *connector, connector->base.id, connector->name);/* If full detect is not performed yet, do a full detect */ -if (!intel_dp->detect_done) +if (!intel_dp->detect_done) { +struct drm_crtc *crtc; +int ret; + + crtc = connector->state->crtc; +if (crtc) { + ret =drm_modeset_lock (&crtc->mutex, ctx); +if (ret) +return ret; + } + status =intel_dp_long_pulse (intel_dp->attached_connector); + } intel_dp->detect_done = false;
@@ -5146,10 +5163,38 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) }if (!intel_dp->is_mst) { +struct drm_modeset_acquire_ctx ctx; +struct drm_connector *connector = &intel_dp->attached_connector->base; +struct drm_crtc *crtc; +int iret; + +drm_modeset_acquire_init (&ctx,0 ); +retry: + iret =drm_modeset_lock (&dev->mode_config.connection_mutex, &ctx); +if (iret) + goto err; + + crtc = connector->state->crtc; +if (crtc) { + iret =drm_modeset_lock (&crtc->mutex, &ctx); +if (iret) + goto err; + } +if (!intel_dp_short_pulse (intel_dp)) { intel_dp->detect_done = false; goto put_power; } + +err: +if (iret == -EDEADLK ) { +drm_modeset_backoff (&ctx); + goto retry; + } + +drm_modeset_drop_locks (&ctx); +drm_modeset_acquire_fini (&ctx); +WARN (iret,"Acquiring modeset locks failed with %i\n" , iret); } ret =IRQ_HANDLED ;
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 1/1 drm/i915: sync dp link status checks against atomic commmits
From: Daniel Vetter <[email protected]>
Two bits:
- check actual atomic state, the legacy stuff can only be looked at from within the atomic_commit_tail function, since it's only protected by ordering and not by any locks.
- Make sure we don't wreak the work an ongoing nonblocking commit is doing.
v2: We need the crtc lock too, because a plane update might change it without having to acquire the connection_mutex (Maarten). Use Maarten's changes for this locking, while keeping the logic that uses the connection->commit->hw_done signal for syncing with nonblocking commits.
v3: The initial state objects from the hw state readout do not have a commit object. Check for that (spotted by CI).
v4: Rebased. (mlankhorst)
Cc: Manasi Navare <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Ville Syrjälä <[email protected]>
References: https://bugs.freedesktop.org/show_bug.cgi?id=103336
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99272
--- drivers/gpu/drm/i915/intel_dp.c | 56 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +51 -5
@@ -4277,6 +4277,8 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; +struct drm_connector_state *conn_state = + intel_dp->attached_connector->base.state;u8 link_status[DP_LINK_STATUS_SIZE ];WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex));
@@ -4286,10 +4288,16 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)return ; } -if (!intel_encoder->base.crtc) +if (!conn_state->crtc)return ; -if (!to_intel_crtc (intel_encoder->base.crtc)->active) +WARN_ON (!drm_modeset_is_locked (&conn_state->crtc->mutex)); + +if (!conn_state->crtc->state->active) +return ; + +if (conn_state->commit && + !try_wait_for_completion (&conn_state->commit->hw_done))return ;/*
@@ -4364,9 +4372,8 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } -drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex,NULL );intel_dp_check_link_status (intel_dp); -drm_modeset_unlock (&dev_priv->drm.mode_config.connection_mutex); +if (intel_dp->compliance.test_type ==DP_TEST_LINK_TRAINING ) {DRM_DEBUG_KMS ("Link Training Compliance Test requested\n" );/* Send a Hotplug Uevent to userspace to start modeset */
@@ -4814,8 +4821,19 @@ intel_dp_detect(struct drm_connector *connector, connector->base.id, connector->name);/* If full detect is not performed yet, do a full detect */ -if (!intel_dp->detect_done) +if (!intel_dp->detect_done) { +struct drm_crtc *crtc; +int ret; + + crtc = connector->state->crtc; +if (crtc) { + ret =drm_modeset_lock (&crtc->mutex, ctx); +if (ret) +return ret; + } + status =intel_dp_long_pulse (intel_dp->attached_connector); + } intel_dp->detect_done = false;
@@ -5097,10 +5115,38 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) }if (!intel_dp->is_mst) { +struct drm_modeset_acquire_ctx ctx; +struct drm_connector *connector = &intel_dp->attached_connector->base; +struct drm_crtc *crtc; +int iret; + +drm_modeset_acquire_init (&ctx,0 ); +retry: + iret =drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex, &ctx); +if (iret) + goto err; + + crtc = connector->state->crtc; +if (crtc) { + iret =drm_modeset_lock (&crtc->mutex, &ctx); +if (iret) + goto err; + } +if (!intel_dp_short_pulse (intel_dp)) { intel_dp->detect_done = false; goto put_power; } + +err: +if (iret == -EDEADLK ) { +drm_modeset_backoff (&ctx); + goto retry; + } + +drm_modeset_drop_locks (&ctx); +drm_modeset_acquire_fini (&ctx); +WARN (iret,"Acquiring modeset locks failed with %i\n" , iret); } ret =IRQ_HANDLED ;
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 1/1 drm/i915: sync dp link status checks against atomic commmits
From: Daniel Vetter <[email protected]>
Two bits:
- check actual atomic state, the legacy stuff can only be looked at from within the atomic_commit_tail function, since it's only protected by ordering and not by any locks.
- Make sure we don't wreak the work an ongoing nonblocking commit is doing.
v2: We need the crtc lock too, because a plane update might change it without having to acquire the connection_mutex (Maarten). Use Maarten's changes for this locking, while keeping the logic that uses the connection->commit->hw_done signal for syncing with nonblocking commits.
v3: The initial state objects from the hw state readout do not have a commit object. Check for that (spotted by CI).
v4: Fix deadlock from jumping to put_power with locks still held.
(mlankhorst)
Cc: Manasi Navare <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Ville Syrjälä <[email protected]>
References: https://bugs.freedesktop.org/show_bug.cgi?id=103336
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99272
--- drivers/gpu/drm/i915/intel_dp.c | 61 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +55 -6
@@ -4277,6 +4277,8 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; +struct drm_connector_state *conn_state = + intel_dp->attached_connector->base.state;u8 link_status[DP_LINK_STATUS_SIZE ];WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex));
@@ -4286,10 +4288,16 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)return ; } -if (!intel_encoder->base.crtc) +if (!conn_state->crtc)return ; -if (!to_intel_crtc (intel_encoder->base.crtc)->active) +WARN_ON (!drm_modeset_is_locked (&conn_state->crtc->mutex)); + +if (!conn_state->crtc->state->active) +return ; + +if (conn_state->commit && + !try_wait_for_completion (&conn_state->commit->hw_done))return ;/*
@@ -4364,9 +4372,8 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } -drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex,NULL );intel_dp_check_link_status (intel_dp); -drm_modeset_unlock (&dev_priv->drm.mode_config.connection_mutex); +if (intel_dp->compliance.test_type ==DP_TEST_LINK_TRAINING ) {DRM_DEBUG_KMS ("Link Training Compliance Test requested\n" );/* Send a Hotplug Uevent to userspace to start modeset */
@@ -4814,8 +4821,19 @@ intel_dp_detect(struct drm_connector *connector, connector->base.id, connector->name);/* If full detect is not performed yet, do a full detect */ -if (!intel_dp->detect_done) +if (!intel_dp->detect_done) { +struct drm_crtc *crtc; +int ret; + + crtc = connector->state->crtc; +if (crtc) { + ret =drm_modeset_lock (&crtc->mutex, ctx); +if (ret) +return ret; + } + status =intel_dp_long_pulse (intel_dp->attached_connector); + } intel_dp->detect_done = false;
@@ -5097,7 +5115,38 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) }if (!intel_dp->is_mst) { -if (!intel_dp_short_pulse (intel_dp)) { +struct drm_modeset_acquire_ctx ctx; +struct drm_connector *connector = &intel_dp->attached_connector->base; +struct drm_crtc *crtc; +int iret; +bool handled = false; + +drm_modeset_acquire_init (&ctx,0 ); +retry: + iret =drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex, &ctx); +if (iret) + goto err; + + crtc = connector->state->crtc; +if (crtc) { + iret =drm_modeset_lock (&crtc->mutex, &ctx); +if (iret) + goto err; + } + + handled =intel_dp_short_pulse (intel_dp); + +err: +if (iret == -EDEADLK ) { +drm_modeset_backoff (&ctx); + goto retry; + } + +drm_modeset_drop_locks (&ctx); +drm_modeset_acquire_fini (&ctx); +WARN (iret,"Acquiring modeset locks failed with %i\n" , iret); + +if (!handled) { intel_dp->detect_done = false; goto put_power; }
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/2] drm/atomic-helper: always track connector commits, too
In reply to Daniel Vetter== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/atomic-helper: always track connector commits, too
URL : https://patchwork.freedesktop.org/series/33591/
State : failure
== Summary ==
CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh CHK scripts/mod/devicetable-offsets.h CHK include/generated/compile.h CHK kernel/config_data.h CC [M] drivers/gpu/drm/i915/intel_dp.o
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_check_link_status’:drivers/gpu/drm/i915/intel_dp.c:4277:1: error: version control conflict marker in file
<<<<<<< HEAD
^~~~~~~drivers/gpu/drm/i915/intel_dp.c:4281:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
struct drm_device *dev = intel_dp_to_dev(intel_dp);
^~~~~~drivers/gpu/drm/i915/intel_dp.c:4282:1: error: version control conflict marker in file
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm/i915: sync dp link status checks against atomic commmits
^~~~~~~drivers/gpu/drm/i915/intel_dp.c:4287:42: error: ‘link_status’ undeclared (first use in this function)
if (!intel_dp_get_link_status(intel_dp, link_status)) {
^~~~~~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4287:42: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/intel_dp.c:4292:7: error: ‘conn_state’ undeclared (first use in this function)
if (!conn_state->crtc)
^~~~~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4281:21: error: unused variable ‘dev’ [-Werror=unused-variable]
struct drm_device *dev = intel_dp_to_dev(intel_dp);
^~~drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_short_pulse’:drivers/gpu/drm/i915/intel_dp.c:4337:1: error: version control conflict marker in file
<<<<<<< HEAD
^~~~~~~drivers/gpu/drm/i915/intel_dp.c:4339:1: error: version control conflict marker in file
=======
^~~~~~~drivers/gpu/drm/i915/intel_dp.c:4341:1: error: version control conflict marker in file
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm/i915: sync dp link status checks against atomic commmits
^~~~~~~drivers/gpu/drm/i915/intel_dp.c:4343:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
u8 old_sink_count = intel_dp->sink_count;
^~drivers/gpu/drm/i915/intel_dp.c:4367:39: error: ‘sink_irq_vector’ undeclared (first use in this function)
intel_dp_get_sink_irq(intel_dp, &sink_irq_vector) &&
^~~~~~~~~~~~~~~drivers/gpu/drm/i915/intel_dp.c:4380:1: error: version control conflict marker in file
<<<<<<< HEAD
^~~~~~~drivers/gpu/drm/i915/intel_dp.c:4383:22: error: ‘dev_priv’ undeclared (first use in this function)
drm_modeset_unlock(&dev_priv->drm.mode_config.connection_mutex);
^~~~~~~~drivers/gpu/drm/i915/intel_dp.c:4384:1: error: version control conflict marker in file
=======
^~~~~~~drivers/gpu/drm/i915/intel_dp.c:4387:1: error: version control conflict marker in file
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm/i915: sync dp link status checks against atomic commmits
^~~~~~~drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_hpd_pulse’:drivers/gpu/drm/i915/intel_dp.c:5136:28: error: ‘dev’ undeclared (first use in this function)
iret = drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx);
^~~drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_short_pulse’:drivers/gpu/drm/i915/intel_dp.c:4395:1: error: control reaches end of non-void function [-Werror=return-type]
}
^
cc1: all warnings being treated as errorsscripts/Makefile.build:314: recipe for target 'drivers/gpu/drm/i915/intel_dp.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_dp.o] Error 1scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:573: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1024: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev2)
In reply to Daniel Vetter== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev2)
URL : https://patchwork.freedesktop.org/series/33591/
State : failure
== Summary ==
Series 33591v2 series starting with [1/2] drm/atomic-helper: always track connector commits, too
https://patchwork.freedesktop.org/api/1.0/series/33591/revisions/2/mbox/
Test chamelium:
Subgroup dp-hpd-fast:
skip -> INCOMPLETE (fi-kbl-r)
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> DMESG-FAIL (fi-kbl-7567u) fdo#102846 +1
Test vgem_basic:
Subgroup dmabuf-export:
pass -> INCOMPLETE (fi-byt-n2820) fdo#103714
pass -> INCOMPLETE (fi-glk-1) fdo#103706fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102846 https://bugs.freedesktop.org/show_bug.cgi?id=102846
fdo#103714 https://bugs.freedesktop.org/show_bug.cgi?id=103714
fdo#103706 https://bugs.freedesktop.org/show_bug.cgi?id=103706
fi-bdw-5557u total:285 pass:263 dwarn:0 dfail:1 fail:0 skip:20 fi-bdw-gvtdvm total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-blb-e6850 total:285 pass:218 dwarn:1 dfail:1 fail:0 skip:64 fi-bsw-n3050 total:285 pass:238 dwarn:0 dfail:1 fail:0 skip:45 fi-bwr-2160 total:285 pass:178 dwarn:0 dfail:1 fail:0 skip:105 fi-bxt-dsi total:285 pass:254 dwarn:0 dfail:1 fail:0 skip:29 fi-bxt-j4205 total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-byt-j1900 total:285 pass:249 dwarn:0 dfail:1 fail:0 skip:34 fi-byt-n2820 total:278 pass:238 dwarn:0 dfail:1 fail:0 skip:38 fi-elk-e7500 total:285 pass:224 dwarn:0 dfail:1 fail:0 skip:59 fi-gdg-551 total:285 pass:174 dwarn:0 dfail:1 fail:1 skip:108 fi-glk-1 total:278 pass:249 dwarn:0 dfail:1 fail:0 skip:27 fi-hsw-4770 total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-hsw-4770r total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-ilk-650 total:285 pass:223 dwarn:0 dfail:1 fail:0 skip:60 fi-ivb-3520m total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-ivb-3770 total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-kbl-7500u total:285 pass:259 dwarn:1 dfail:1 fail:0 skip:23 fi-kbl-7567u total:119 pass:105 dwarn:0 dfail:1 fail:0 skip:12 fi-kbl-r total:1 pass:0 dwarn:0 dfail:0 fail:0 skip:0 fi-pnv-d510 total:285 pass:217 dwarn:1 dfail:1 fail:0 skip:65 fi-skl-6260u total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-6700hq total:285 pass:258 dwarn:0 dfail:1 fail:0 skip:25 fi-skl-6700k total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-skl-6770hq total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-gvtdvm total:285 pass:261 dwarn:0 dfail:1 fail:0 skip:22 fi-snb-2520m total:246 pass:212 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:285 pass:244 dwarn:0 dfail:1 fail:0 skip:39 Blacklisted hosts: fi-cfl-s total:285 pass:252 dwarn:0 dfail:1 fail:0 skip:31 fi-glk-dsi total:42 pass:29 dwarn:0 dfail:1 fail:0 skip:11
9a81c142768eb620a24b02a136716a44c304563f drm-tip: 2017y-11m-13d-11h-44m-54s UTC integration manifest c5f2d9fa446f drm/i915: sync dp link status checks against atomic commmits ad2294700fcf drm/atomic-helper: always track connector commits, too
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7089/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev3)
In reply to Daniel Vetter== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev3)
URL : https://patchwork.freedesktop.org/series/33591/
State : success
== Summary ==
Series 33591v3 series starting with [1/2] drm/atomic-helper: always track connector commits, too
https://patchwork.freedesktop.org/api/1.0/series/33591/revisions/3/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713
incomplete -> PASS (fi-kbl-7560u) fdo#103706
Test vgem_basic:
Subgroup dmabuf-export:
pass -> INCOMPLETE (fi-byt-n2820) fdo#103714
Subgroup unload:
notrun -> INCOMPLETE (fi-snb-2520m) fdo#103702 +1fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103706 https://bugs.freedesktop.org/show_bug.cgi?id=103706
fdo#103714 https://bugs.freedesktop.org/show_bug.cgi?id=103714
fdo#103702 https://bugs.freedesktop.org/show_bug.cgi?id=103702
fi-bdw-5557u total:285 pass:263 dwarn:0 dfail:1 fail:0 skip:20 fi-bdw-gvtdvm total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-blb-e6850 total:285 pass:218 dwarn:1 dfail:1 fail:0 skip:64 fi-bsw-n3050 total:285 pass:238 dwarn:0 dfail:1 fail:0 skip:45 fi-bwr-2160 total:285 pass:178 dwarn:0 dfail:1 fail:0 skip:105 fi-bxt-dsi total:285 pass:254 dwarn:0 dfail:1 fail:0 skip:29 fi-bxt-j4205 total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-byt-j1900 total:285 pass:249 dwarn:0 dfail:1 fail:0 skip:34 fi-byt-n2820 total:278 pass:238 dwarn:0 dfail:1 fail:0 skip:38 fi-elk-e7500 total:285 pass:224 dwarn:0 dfail:1 fail:0 skip:59 fi-gdg-551 total:285 pass:174 dwarn:0 dfail:1 fail:1 skip:108 fi-glk-1 total:285 pass:256 dwarn:0 dfail:1 fail:0 skip:27 fi-hsw-4770 total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-hsw-4770r total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-ilk-650 total:285 pass:223 dwarn:0 dfail:1 fail:0 skip:60 fi-ivb-3520m total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-ivb-3770 total:285 pass:255 dwarn:0 dfail:1 fail:0 skip:28 fi-kbl-7500u total:285 pass:259 dwarn:1 dfail:1 fail:0 skip:23 fi-kbl-7560u total:285 pass:265 dwarn:0 dfail:1 fail:0 skip:18 fi-kbl-7567u total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-kbl-r total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-pnv-d510 total:285 pass:217 dwarn:1 dfail:1 fail:0 skip:65 fi-skl-6260u total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-6600u total:285 pass:257 dwarn:0 dfail:1 fail:0 skip:26 fi-skl-6700hq total:285 pass:258 dwarn:0 dfail:1 fail:0 skip:25 fi-skl-6700k total:285 pass:260 dwarn:0 dfail:1 fail:0 skip:23 fi-skl-6770hq total:285 pass:264 dwarn:0 dfail:1 fail:0 skip:19 fi-skl-gvtdvm total:285 pass:261 dwarn:0 dfail:1 fail:0 skip:22 fi-snb-2520m total:285 pass:245 dwarn:0 dfail:1 fail:0 skip:38 fi-snb-2600 total:285 pass:244 dwarn:0 dfail:1 fail:0 skip:39
Blacklisted hosts:
fi-cfl-s total:285 pass:252 dwarn:0 dfail:1 fail:0 skip:31
fi-cnl-y failed to connect after reboot
9a81c142768eb620a24b02a136716a44c304563f drm-tip: 2017y-11m-13d-11h-44m-54s UTC integration manifest adbc6e00d143 drm/i915: sync dp link status checks against atomic commmits 5762c32681ca drm/atomic-helper: always track connector commits, too
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7096/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev3)
In reply to Daniel Vetter== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev3)
URL : https://patchwork.freedesktop.org/series/33591/
State : success
== Summary ==
Test drv_module_reload:
Subgroup basic-no-display:
dmesg-warn -> INCOMPLETE (shard-hsw) fdo#102707
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2551 pass:1452 dwarn:2 dfail:2 fail:10 skip:1084 time:9321s
Blacklisted hosts:
shard-apl total:2543 pass:1582 dwarn:0 dfail:1 fail:22 skip:936 time:12786s shard-kbl total:2474 pass:1632 dwarn:7 dfail:8 fail:24 skip:800 time:9977s shard-snb total:2584 pass:1211 dwarn:1 dfail:2 fail:12 skip:1358 time:7743s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7096/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev3)
In reply to Daniel Vetter== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/atomic-helper: always track connector commits, too (rev3)
URL : https://patchwork.freedesktop.org/series/33591/
State : warning
== Summary ==
Series 33591v3 series starting with [1/2] drm/atomic-helper: always track connector commits, too
https://patchwork.freedesktop.org/api/1.0/series/33591/revisions/3/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514
Test gem_exec_reloc:
Subgroup basic-cpu-gtt-active:
fail -> PASS (fi-gdg-551) fdo#102582 +1
Subgroup basic-write-cpu-active:
fail -> PASS (fi-gdg-551) fdo#102582 +1
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-b:
pass -> SKIP (fi-hsw-4770r)
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:438s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:456s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:381s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:543s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:276s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:503s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:505s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:494s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:484s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:429s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:541s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:430s fi-hsw-4770r total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:439s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:426s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:484s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:459s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:478s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:523s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:473s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:532s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:574s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:457s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:542s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:562s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:518s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:498s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:459s fi-snb-2520m total:246 pass:212 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:419s Blacklisted hosts: fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:532s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:549s
cf2083e59a2aeb1f8255a5cd1d621b55d7b2d851 drm-tip: 2017y-11m-14d-23h-52m-56s UTC integration manifest 6f17f6bf8f1c drm/i915: sync dp link status checks against atomic commmits 4d12892c5624 drm/atomic-helper: always track connector commits, too
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7136/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerOp 10-11-17 om 11:53 schreef Daniel Vetter:
Quoted 32 lines
It's useful for syncing async connector work like link retraining.
v2: Make it work (Manasi&Ville)
Cc Manasi Navare <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_atomic_helper.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_atomic_helper.c +2
-5@@ -1793,11 +1793,8 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, !try_wait_for_completion(&old_conn_state->commit->flip_done))return -EBUSY ; -/* commit tracked through new_crtc_state->commit, no need to do it explicitly */ -if (new_conn_state->crtc) -continue ; - - commit =crtc_or_fake_commit (state, old_conn_state->crtc); +/* Always track connectors explicitly for e.g. link retraining. */ + commit =crtc_or_fake_commit (state, new_conn_state->crtc ?: old_conn_state->crtc);if (!commit)return -ENOMEM ;@@ -1811,10 +1808,7 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, !try_wait_for_completion(&old_plane_state->commit->flip_done))
drivers/gpu/drm/drm_atomic_helper.c int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, · line 1814
Quoted 10 lines
drivers/gpu/drm/drm_atomic_helper.c +1
-4return -EBUSY ; -/* -* Unlike connectors, always track planes explicitly for -* async pageflip support. -*/ +/* Always track planes explicitly for async pageflip support. */ commit =crtc_or_fake_commit (state, new_plane_state->crtc ?: old_plane_state->crtc);if (!commit)return -ENOMEM ;
First patch reviewed and pushed to drm-misc-next. Will wait for CI_DRM results before pushing the second patch, though I don't expect anything breaking from this. :-)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx