AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: <sunpeng.li@amd.com>
To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Leo Li <sunpeng.li@amd.com>, nicholas.kazlauskas@amd.com
Subject: [PATCH 6/9 v2] drm/i915: Implement MST Aux device registration
Date: Tue, 23 Jul 2019 19:28:05 -0400	[thread overview]
Message-ID: <20190723232808.28128-7-sunpeng.li@amd.com> (raw)
In-Reply-To: <20190723232808.28128-1-sunpeng.li@amd.com>

From: Leo Li <sunpeng.li@amd.com>

Implement late_register and early_unregister hooks for MST connectors.
Call drm helpers for MST connector registration, which registers the
AUX devices.

Signed-off-by: Leo Li <sunpeng.li@amd.com>

v2 changes:
Unwind intel_connector_register on mst late register failure.
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 60652ebbdf61..0633ebf3f1bf 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -400,13 +400,42 @@ intel_dp_mst_detect(struct drm_connector *connector, bool force)
 				      intel_connector->port);
 }
 
+static int
+intel_dp_mst_connector_late_register(struct drm_connector *connector)
+{
+	struct intel_connector *intel_connector = to_intel_connector(connector);
+	struct drm_dp_mst_port *port = intel_connector->port;
+
+	int ret;
+
+	ret = intel_connector_register(connector);
+	if (ret)
+		return ret;
+
+	ret = drm_dp_mst_connector_late_register(connector, port);
+	if (ret)
+		intel_connector_unregister(connector);
+
+	return ret;
+}
+
+static void
+intel_dp_mst_connector_early_unregister(struct drm_connector *connector)
+{
+	struct intel_connector *intel_connector = to_intel_connector(connector);
+	struct drm_dp_mst_port *port = intel_connector->port;
+
+	drm_dp_mst_connector_early_unregister(connector, port);
+	intel_connector_unregister(connector);
+}
+
 static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {
 	.detect = intel_dp_mst_detect,
 	.fill_modes = drm_helper_probe_single_connector_modes,
 	.atomic_get_property = intel_digital_connector_atomic_get_property,
 	.atomic_set_property = intel_digital_connector_atomic_set_property,
-	.late_register = intel_connector_register,
-	.early_unregister = intel_connector_unregister,
+	.late_register = intel_dp_mst_connector_late_register,
+	.early_unregister = intel_dp_mst_connector_early_unregister,
 	.destroy = intel_connector_destroy,
 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 	.atomic_duplicate_state = intel_digital_connector_duplicate_state,
-- 
2.22.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2019-07-23 23:28 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-23 23:27 [PATCH 0/9] MST AUX Devices (v3) sunpeng.li
     [not found] ` <20190723232808.28128-1-sunpeng.li-5C7GfCeVMHo@public.gmane.org>
2019-07-23 23:28   ` [PATCH 1/9] drm/dp: Use non-cyclic idr sunpeng.li-5C7GfCeVMHo
2019-07-23 23:28   ` [PATCH 2/9 v3] drm/dp_mst: Enable registration of AUX devices for MST ports sunpeng.li-5C7GfCeVMHo
     [not found]     ` <20190723232808.28128-3-sunpeng.li-5C7GfCeVMHo@public.gmane.org>
2019-07-25 19:59       ` Lyude Paul
2019-07-23 23:28   ` [PATCH 3/9] drm/nouveau: Use connector kdev as aux device parent sunpeng.li-5C7GfCeVMHo
2019-07-23 23:28   ` [PATCH 4/9] drm/bridge/analogix-anx78xx: " sunpeng.li-5C7GfCeVMHo
2019-07-23 23:28   ` [PATCH 5/9] drm/amd/display: " sunpeng.li-5C7GfCeVMHo
2019-07-23 23:28   ` [PATCH 7/9] drm/nouveau/kms/nv50: Implement MST Aux device registration sunpeng.li-5C7GfCeVMHo
     [not found]     ` <20190723232808.28128-8-sunpeng.li-5C7GfCeVMHo@public.gmane.org>
2019-07-25 20:57       ` Lyude Paul
2019-07-23 23:28 ` sunpeng.li [this message]
2019-07-23 23:28 ` [PATCH 8/9] drm/radeon: " sunpeng.li
2019-07-23 23:28 ` [PATCH 9/9] drm/amd/display: " sunpeng.li
2019-07-24 20:05   ` Kazlauskas, Nicholas
2019-07-24 20:06     ` Li, Sun peng (Leo)

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=20190723232808.28128-7-sunpeng.li@amd.com \
    --to=sunpeng.li@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=nicholas.kazlauskas@amd.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