Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Ser <contact@emersion.fr>
To: intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>
Subject: [Intel-gfx] [PATCH 2/2] drm/i915/dp_mst: don't pull unregistered connectors into state
Date: Thu, 15 Dec 2022 15:51:50 +0000	[thread overview]
Message-ID: <20221215155138.246676-2-contact@emersion.fr> (raw)
In-Reply-To: <20221215155138.246676-1-contact@emersion.fr>

In intel_dp_mst_atomic_master_trans_check(), we pull connectors
sharing the same DP-MST stream into the atomic state. However,
if the connector is unregistered, this later fails with:

    [  559.425658] i915 0000:00:02.0: [drm:drm_atomic_helper_check_modeset] [CONNECTOR:378:DP-7] is not registered

Skip these unregistered connectors to allow user-space to turn them
off.

Fixes part of this wlroots issue:
https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3407

Signed-off-by: Simon Ser <contact@emersion.fr>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Lyude Paul <lyude@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index f773e117ebc4..70859a927a9d 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -280,7 +280,8 @@ intel_dp_mst_atomic_master_trans_check(struct intel_connector *connector,
 		struct intel_crtc *crtc;
 
 		if (connector_iter->mst_port != connector->mst_port ||
-		    connector_iter == connector)
+		    connector_iter == connector ||
+		    connector_iter->base.registration_state == DRM_CONNECTOR_UNREGISTERED)
 			continue;
 
 		conn_iter_state = intel_atomic_get_digital_connector_state(state,
-- 
2.39.0



  reply	other threads:[~2022-12-15 15:52 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-15 15:51 [Intel-gfx] [PATCH 1/2] drm/i915/dp_mst: log when pulling CRTCs into atomic state Simon Ser
2022-12-15 15:51 ` Simon Ser [this message]
2022-12-20 10:39   ` [Intel-gfx] [PATCH 2/2] drm/i915/dp_mst: don't pull unregistered connectors into state Ville Syrjälä
2022-12-20 11:09     ` Imre Deak
2022-12-15 16:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/dp_mst: log when pulling CRTCs into atomic state Patchwork
2022-12-16 14:09 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-12-21 22:02 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/dp_mst: log when pulling CRTCs into atomic state (rev2) Patchwork
2022-12-21 22:02 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-12-21 23:24 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-12-22  2:08 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221215155138.246676-2-contact@emersion.fr \
    --to=contact@emersion.fr \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox