From: Wayne Lin <Wayne.Lin@amd.com> To: <dri-devel@lists.freedesktop.org> Cc: lyude@redhat.com, Nicholas.Kazlauskas@amd.com, harry.wentland@amd.com, jerry.zuo@amd.com, hersenxs.wu@amd.com, "Wayne Lin" <Wayne.Lin@amd.com>, "Juston Li" <juston.li@intel.com>, "Imre Deak" <imre.deak@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Harry Wentland" <hwentlan@amd.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Sean Paul" <sean@poorly.run>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Maxime Ripard" <mripard@kernel.org>, "Thomas Zimmermann" <tzimmermann@suse.de>, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel@ffwll.ch>, "Alex Deucher" <alexander.deucher@amd.com>, "Nicholas Kazlauskas" <nicholas.kazlauskas@amd.com>, "Rodrigo Siqueira" <Rodrigo.Siqueira@amd.com>, "Aurabindo Pillai" <aurabindo.pillai@amd.com>, "Eryk Brol" <eryk.brol@amd.com>, "Bas Nieuwenhuizen" <bas@basnieuwenhuizen.nl>, "Nikola Cornij" <nikola.cornij@amd.com>, "Jani Nikula" <jani.nikula@intel.com>, "Manasi Navare" <manasi.d.navare@intel.com>, "Ankit Nautiyal" <ankit.k.nautiyal@intel.com>, "José Roberto de Souza" <jose.souza@intel.com>, "Sean Paul" <seanpaul@chromium.org>, "Ben Skeggs" <bskeggs@redhat.com>, stable@vger.kernel.org Subject: [PATCH 2/4] drm/dp_mst: Only create connector for connected end device Date: Wed, 21 Jul 2021 00:03:40 +0800 [thread overview] Message-ID: <20210720160342.11415-3-Wayne.Lin@amd.com> (raw) In-Reply-To: <20210720160342.11415-1-Wayne.Lin@amd.com> [Why] Currently, we will create connectors for all output ports no matter it's connected or not. However, in MST, we can only determine whether an output port really stands for a "connector" till it is connected and check its peer device type as an end device. In current code, we have chance to create connectors for output ports connected with branch device and these are redundant connectors. e.g. StarTech 1-to-4 DP hub is constructed by internal 2 layer 1-to-2 branch devices. Creating connectors for such internal output ports are redundant. [How] Put constraint on creating connector for connected end device only. Fixes: 6f85f73821f6 ("drm/dp_mst: Add basic topology reprobing when resuming") Cc: Juston Li <juston.li@intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Harry Wentland <hwentlan@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Sean Paul <sean@poorly.run> Cc: Lyude Paul <lyude@redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Cc: Aurabindo Pillai <aurabindo.pillai@amd.com> Cc: Eryk Brol <eryk.brol@amd.com> Cc: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Cc: Nikola Cornij <nikola.cornij@amd.com> Cc: Wayne Lin <Wayne.Lin@amd.com> Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Cc: "José Roberto de Souza" <jose.souza@intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: dri-devel@lists.freedesktop.org Cc: <stable@vger.kernel.org> # v5.5+ Signed-off-by: Wayne Lin <Wayne.Lin@amd.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 51cd7f74f026..f13c7187b07f 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2474,7 +2474,8 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, if (port->connector) drm_modeset_unlock(&mgr->base.lock); - else if (!port->input) + else if (!port->input && port->pdt != DP_PEER_DEVICE_NONE && + drm_dp_mst_is_end_device(port->pdt, port->mcs)) drm_dp_mst_port_add_connector(mstb, port); if (send_link_addr && port->mstb) { @@ -2557,6 +2558,10 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb, dowork = false; } + if (!port->input && !port->connector && new_pdt != DP_PEER_DEVICE_NONE && + drm_dp_mst_is_end_device(new_pdt, new_mcs)) + create_connector = true; + if (port->connector) drm_modeset_unlock(&mgr->base.lock); else if (create_connector) -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Wayne Lin <Wayne.Lin@amd.com> To: <dri-devel@lists.freedesktop.org> Cc: "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "José Roberto de Souza" <jose.souza@intel.com>, "Harry Wentland" <hwentlan@amd.com>, "Rodrigo Siqueira" <Rodrigo.Siqueira@amd.com>, jerry.zuo@amd.com, "Aurabindo Pillai" <aurabindo.pillai@amd.com>, "Ben Skeggs" <bskeggs@redhat.com>, "Ankit Nautiyal" <ankit.k.nautiyal@intel.com>, "Juston Li" <juston.li@intel.com>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Jani Nikula" <jani.nikula@intel.com>, "Wayne Lin" <Wayne.Lin@amd.com>, "Nikola Cornij" <nikola.cornij@amd.com>, hersenxs.wu@amd.com, "Sean Paul" <sean@poorly.run>, "Eryk Brol" <eryk.brol@amd.com>, stable@vger.kernel.org, "Manasi Navare" <manasi.d.navare@intel.com>, "Alex Deucher" <alexander.deucher@amd.com>, "Sean Paul" <seanpaul@chromium.org>, "Nicholas Kazlauskas" <nicholas.kazlauskas@amd.com> Subject: [PATCH 2/4] drm/dp_mst: Only create connector for connected end device Date: Wed, 21 Jul 2021 00:03:40 +0800 [thread overview] Message-ID: <20210720160342.11415-3-Wayne.Lin@amd.com> (raw) In-Reply-To: <20210720160342.11415-1-Wayne.Lin@amd.com> [Why] Currently, we will create connectors for all output ports no matter it's connected or not. However, in MST, we can only determine whether an output port really stands for a "connector" till it is connected and check its peer device type as an end device. In current code, we have chance to create connectors for output ports connected with branch device and these are redundant connectors. e.g. StarTech 1-to-4 DP hub is constructed by internal 2 layer 1-to-2 branch devices. Creating connectors for such internal output ports are redundant. [How] Put constraint on creating connector for connected end device only. Fixes: 6f85f73821f6 ("drm/dp_mst: Add basic topology reprobing when resuming") Cc: Juston Li <juston.li@intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Harry Wentland <hwentlan@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Sean Paul <sean@poorly.run> Cc: Lyude Paul <lyude@redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Cc: Aurabindo Pillai <aurabindo.pillai@amd.com> Cc: Eryk Brol <eryk.brol@amd.com> Cc: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Cc: Nikola Cornij <nikola.cornij@amd.com> Cc: Wayne Lin <Wayne.Lin@amd.com> Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Cc: "José Roberto de Souza" <jose.souza@intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: dri-devel@lists.freedesktop.org Cc: <stable@vger.kernel.org> # v5.5+ Signed-off-by: Wayne Lin <Wayne.Lin@amd.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 51cd7f74f026..f13c7187b07f 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2474,7 +2474,8 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, if (port->connector) drm_modeset_unlock(&mgr->base.lock); - else if (!port->input) + else if (!port->input && port->pdt != DP_PEER_DEVICE_NONE && + drm_dp_mst_is_end_device(port->pdt, port->mcs)) drm_dp_mst_port_add_connector(mstb, port); if (send_link_addr && port->mstb) { @@ -2557,6 +2558,10 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb, dowork = false; } + if (!port->input && !port->connector && new_pdt != DP_PEER_DEVICE_NONE && + drm_dp_mst_is_end_device(new_pdt, new_mcs)) + create_connector = true; + if (port->connector) drm_modeset_unlock(&mgr->base.lock); else if (create_connector) -- 2.17.1
next prev parent reply other threads:[~2021-07-20 16:06 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-20 16:03 [PATCH 0/4] Unregister mst connectors when hotplug Wayne Lin 2021-07-20 16:03 ` [PATCH 1/4] drm/dp_mst: Put malloc_kref of vcpi pointing port when disable MST Wayne Lin 2021-07-20 16:03 ` Wayne Lin 2021-07-20 16:03 ` Wayne Lin [this message] 2021-07-20 16:03 ` [PATCH 2/4] drm/dp_mst: Only create connector for connected end device Wayne Lin 2021-08-03 23:58 ` Lyude Paul 2021-08-04 0:08 ` Lyude Paul 2021-08-04 7:13 ` Lin, Wayne 2021-08-10 20:45 ` Lyude Paul 2021-08-11 9:49 ` Lin, Wayne 2021-08-18 18:58 ` Lyude Paul 2021-08-20 11:20 ` Lin, Wayne 2021-08-20 20:47 ` Lyude Paul 2021-08-23 6:33 ` Lin, Wayne 2021-08-23 21:18 ` Lyude Paul 2021-08-25 3:35 ` Lin, Wayne 2021-08-31 22:47 ` Lyude Paul 2021-09-01 21:59 ` Lyude Paul 2021-09-14 8:46 ` Lin, Wayne 2021-09-17 17:48 ` Lyude Paul 2021-10-26 3:50 ` Lin, Wayne 2021-10-26 19:34 ` Lyude Paul 2021-10-29 12:11 ` Lin, Wayne 2021-11-02 22:31 ` Lyude Paul 2021-11-02 22:31 ` Lyude Paul 2021-10-12 21:17 ` Lyude Paul 2021-10-15 10:16 ` Lin, Wayne 2021-07-20 16:03 ` [PATCH 3/4] drm/dp_mst: Put connector of disconnected end device when handling CSN Wayne Lin 2021-07-20 16:03 ` Wayne Lin 2021-07-20 16:03 ` [PATCH 4/4] drm/dp_mst: Release disconnected connectors when resume Wayne Lin 2021-07-20 16:03 ` Wayne Lin
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=20210720160342.11415-3-Wayne.Lin@amd.com \ --to=wayne.lin@amd.com \ --cc=Nicholas.Kazlauskas@amd.com \ --cc=Rodrigo.Siqueira@amd.com \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=ankit.k.nautiyal@intel.com \ --cc=aurabindo.pillai@amd.com \ --cc=bas@basnieuwenhuizen.nl \ --cc=bskeggs@redhat.com \ --cc=daniel.vetter@ffwll.ch \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=eryk.brol@amd.com \ --cc=harry.wentland@amd.com \ --cc=hersenxs.wu@amd.com \ --cc=hwentlan@amd.com \ --cc=imre.deak@intel.com \ --cc=jani.nikula@intel.com \ --cc=jerry.zuo@amd.com \ --cc=jose.souza@intel.com \ --cc=juston.li@intel.com \ --cc=lyude@redhat.com \ --cc=maarten.lankhorst@linux.intel.com \ --cc=manasi.d.navare@intel.com \ --cc=mripard@kernel.org \ --cc=nikola.cornij@amd.com \ --cc=sean@poorly.run \ --cc=seanpaul@chromium.org \ --cc=stable@vger.kernel.org \ --cc=tzimmermann@suse.de \ --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.