From: Jani Nikula <jani.nikula@intel.com> To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com, Jani Nikula <jani.nikula@intel.com>, Arun R Murthy <arun.r.murthy@intel.com> Subject: [PATCH v3 5/6] drm/i915/mst: add intel_dp_mst_disconnect() Date: Wed, 6 Mar 2024 16:07:16 +0200 [thread overview] Message-ID: <0fdbb14d5cc6bfead388fea75ad611b667b17756.1709733981.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1709733981.git.jani.nikula@intel.com> Abstract the MST mode disconnect to a separate function. Cc: Arun R Murthy <arun.r.murthy@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 41f83d01a884..3956604d8b00 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4112,6 +4112,20 @@ intel_dp_mst_configure(struct intel_dp *intel_dp) intel_dp->mst_detect = DRM_DP_SST; } +static void +intel_dp_mst_disconnect(struct intel_dp *intel_dp) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + + if (!intel_dp->is_mst) + return; + + drm_dbg_kms(&i915->drm, "MST device may have disappeared %d vs %d\n", + intel_dp->is_mst, intel_dp->mst_mgr.mst_state); + intel_dp->is_mst = false; + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); +} + static bool intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *esi) { @@ -5719,15 +5733,7 @@ intel_dp_detect(struct drm_connector *connector, memset(intel_connector->dp.dsc_dpcd, 0, sizeof(intel_connector->dp.dsc_dpcd)); intel_dp->psr.sink_panel_replay_support = false; - if (intel_dp->is_mst) { - drm_dbg_kms(&dev_priv->drm, - "MST device may have disappeared %d vs %d\n", - intel_dp->is_mst, - intel_dp->mst_mgr.mst_state); - intel_dp->is_mst = false; - drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, - intel_dp->is_mst); - } + intel_dp_mst_disconnect(intel_dp); intel_dp_tunnel_disconnect(intel_dp); -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com> To: <intel-gfx@lists.freedesktop.org> Cc: <ville.syrjala@linux.intel.com>, Jani Nikula <jani.nikula@intel.com>, "Arun R Murthy" <arun.r.murthy@intel.com> Subject: [PATCH v3 5/6] drm/i915/mst: add intel_dp_mst_disconnect() Date: Wed, 6 Mar 2024 16:07:16 +0200 [thread overview] Message-ID: <0fdbb14d5cc6bfead388fea75ad611b667b17756.1709733981.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1709733981.git.jani.nikula@intel.com> Abstract the MST mode disconnect to a separate function. Cc: Arun R Murthy <arun.r.murthy@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 41f83d01a884..3956604d8b00 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4112,6 +4112,20 @@ intel_dp_mst_configure(struct intel_dp *intel_dp) intel_dp->mst_detect = DRM_DP_SST; } +static void +intel_dp_mst_disconnect(struct intel_dp *intel_dp) +{ + struct drm_i915_private *i915 = dp_to_i915(intel_dp); + + if (!intel_dp->is_mst) + return; + + drm_dbg_kms(&i915->drm, "MST device may have disappeared %d vs %d\n", + intel_dp->is_mst, intel_dp->mst_mgr.mst_state); + intel_dp->is_mst = false; + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); +} + static bool intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *esi) { @@ -5719,15 +5733,7 @@ intel_dp_detect(struct drm_connector *connector, memset(intel_connector->dp.dsc_dpcd, 0, sizeof(intel_connector->dp.dsc_dpcd)); intel_dp->psr.sink_panel_replay_support = false; - if (intel_dp->is_mst) { - drm_dbg_kms(&dev_priv->drm, - "MST device may have disappeared %d vs %d\n", - intel_dp->is_mst, - intel_dp->mst_mgr.mst_state); - intel_dp->is_mst = false; - drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, - intel_dp->is_mst); - } + intel_dp_mst_disconnect(intel_dp); intel_dp_tunnel_disconnect(intel_dp); -- 2.39.2
next prev parent reply other threads:[~2024-03-06 14:07 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-06 14:07 [PATCH v3 0/6] drm/i915/mst: enable MST mode for 128b/132b single-stream sideband Jani Nikula 2024-03-06 14:07 ` Jani Nikula 2024-03-06 14:07 ` [PATCH v3 1/6] drm/mst: read sideband messaging cap Jani Nikula 2024-03-06 14:07 ` Jani Nikula 2024-03-06 14:07 ` [PATCH v3 2/6] drm/i915/mst: improve debug logging of DP MST mode detect Jani Nikula 2024-03-06 14:07 ` Jani Nikula 2024-03-06 14:07 ` [PATCH v3 3/6] drm/i915/mst: abstract choosing the MST mode to use Jani Nikula 2024-03-06 14:07 ` Jani Nikula 2024-03-06 14:07 ` [PATCH v3 4/6] drm/i915/mst: use the MST mode detected previously Jani Nikula 2024-03-06 14:07 ` Jani Nikula 2024-03-06 14:07 ` Jani Nikula [this message] 2024-03-06 14:07 ` [PATCH v3 5/6] drm/i915/mst: add intel_dp_mst_disconnect() Jani Nikula 2024-03-06 14:07 ` [PATCH v3 6/6] drm/i915/mst: enable MST mode for 128b/132b single-stream sideband Jani Nikula 2024-03-06 14:07 ` Jani Nikula 2024-03-15 11:29 ` Ville Syrjälä 2024-03-06 23:03 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/mst: enable MST mode for 128b/132b single-stream sideband (rev4) Patchwork 2024-03-06 23:04 ` ✗ Fi.CI.SPARSE: " Patchwork 2024-03-06 23:18 ` ✓ Fi.CI.BAT: success " Patchwork 2024-03-07 16:18 ` ✗ Fi.CI.IGT: failure " 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=0fdbb14d5cc6bfead388fea75ad611b667b17756.1709733981.git.jani.nikula@intel.com \ --to=jani.nikula@intel.com \ --cc=arun.r.murthy@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=ville.syrjala@linux.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.