From: Lyude Paul <lyude@redhat.com> To: intel-gfx@lists.freedesktop.org Cc: "Manasi Navare" <manasi.d.navare@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Gustavo Padovan" <gustavo@padovan.org>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Sean Paul" <seanpaul@chromium.org>, "David Airlie" <airlied@linux.ie>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 06/10] drm/dp_mst: Add reset_state callback to topology mgr Date: Wed, 11 Apr 2018 15:29:33 -0400 [thread overview] Message-ID: <20180411192951.21997-7-lyude@redhat.com> (raw) In-Reply-To: <20180411192951.21997-1-lyude@redhat.com> This gives drivers subclassing drm_dp_mst_topology_state the ability to prepare their topology states for a new hub to be connected whenever it's detected that the currently connected topology has been disconnected from the system. We'll need this in order to correctly track RX capabilities in i915 from the topology's atomic state. Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Lyude Paul <lyude@redhat.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 11 +++++++++++ include/drm/drm_dp_mst_helper.h | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 8a72eed0ae05..b55fd545d6a3 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2096,6 +2096,16 @@ static bool drm_dp_get_vc_payload_bw(int dp_link_bw, return true; } +static void drm_dp_mst_topology_reset_state(struct drm_dp_mst_topology_mgr *mgr) +{ + struct drm_dp_mst_topology_state *state = + to_dp_mst_topology_state(mgr->base.state); + + + if (mgr->cbs->reset_state) + mgr->cbs->reset_state(state); +} + /** * drm_dp_mst_topology_mgr_set_mst() - Set the MST state for a topology manager * @mgr: manager to set state for @@ -2171,6 +2181,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms mgr->payload_mask = 0; set_bit(0, &mgr->payload_mask); mgr->vcpi_mask = 0; + drm_dp_mst_topology_reset_state(mgr); } out_unlock: diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index b42922987470..fd856c371a6e 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -381,6 +381,7 @@ struct drm_dp_sideband_msg_tx { /* sideband msg handler */ struct drm_dp_mst_topology_mgr; +struct drm_dp_mst_topology_state; struct drm_dp_mst_topology_cbs { /* create a connector for a port */ struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *path); @@ -388,7 +389,7 @@ struct drm_dp_mst_topology_cbs { void (*destroy_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_connector *connector); void (*hotplug)(struct drm_dp_mst_topology_mgr *mgr); - + void (*reset_state)(struct drm_dp_mst_topology_state *state); }; #define DP_MAX_PAYLOAD (sizeof(unsigned long) * 8) -- 2.14.3
WARNING: multiple messages have this Message-ID (diff)
From: Lyude Paul <lyude@redhat.com> To: intel-gfx@lists.freedesktop.org Cc: David Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v6 06/10] drm/dp_mst: Add reset_state callback to topology mgr Date: Wed, 11 Apr 2018 15:29:33 -0400 [thread overview] Message-ID: <20180411192951.21997-7-lyude@redhat.com> (raw) In-Reply-To: <20180411192951.21997-1-lyude@redhat.com> This gives drivers subclassing drm_dp_mst_topology_state the ability to prepare their topology states for a new hub to be connected whenever it's detected that the currently connected topology has been disconnected from the system. We'll need this in order to correctly track RX capabilities in i915 from the topology's atomic state. Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Lyude Paul <lyude@redhat.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 11 +++++++++++ include/drm/drm_dp_mst_helper.h | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 8a72eed0ae05..b55fd545d6a3 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2096,6 +2096,16 @@ static bool drm_dp_get_vc_payload_bw(int dp_link_bw, return true; } +static void drm_dp_mst_topology_reset_state(struct drm_dp_mst_topology_mgr *mgr) +{ + struct drm_dp_mst_topology_state *state = + to_dp_mst_topology_state(mgr->base.state); + + + if (mgr->cbs->reset_state) + mgr->cbs->reset_state(state); +} + /** * drm_dp_mst_topology_mgr_set_mst() - Set the MST state for a topology manager * @mgr: manager to set state for @@ -2171,6 +2181,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms mgr->payload_mask = 0; set_bit(0, &mgr->payload_mask); mgr->vcpi_mask = 0; + drm_dp_mst_topology_reset_state(mgr); } out_unlock: diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index b42922987470..fd856c371a6e 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -381,6 +381,7 @@ struct drm_dp_sideband_msg_tx { /* sideband msg handler */ struct drm_dp_mst_topology_mgr; +struct drm_dp_mst_topology_state; struct drm_dp_mst_topology_cbs { /* create a connector for a port */ struct drm_connector *(*add_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, const char *path); @@ -388,7 +389,7 @@ struct drm_dp_mst_topology_cbs { void (*destroy_connector)(struct drm_dp_mst_topology_mgr *mgr, struct drm_connector *connector); void (*hotplug)(struct drm_dp_mst_topology_mgr *mgr); - + void (*reset_state)(struct drm_dp_mst_topology_state *state); }; #define DP_MAX_PAYLOAD (sizeof(unsigned long) * 8) -- 2.14.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-04-11 19:30 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-11 19:29 [PATCH v6 00/10] drm/i915: Implement proper fallback training for MST Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` [PATCH v6 01/10] drm/atomic: Print debug message on atomic check failure Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` [PATCH v6 02/10] drm/i915: Move DP modeset retry work into intel_dp Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` [PATCH v6 03/10] drm/dp_mst: Fix naming on drm_atomic_get_mst_topology_state() Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` [PATCH v6 04/10] drm/dp_mst: Remove all evil duplicate state pointers Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` [PATCH v6 05/10] drm/dp_mst: Make drm_dp_mst_topology_state subclassable Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` Lyude Paul [this message] 2018-04-11 19:29 ` [PATCH v6 06/10] drm/dp_mst: Add reset_state callback to topology mgr Lyude Paul 2018-04-11 19:29 ` [PATCH v6 07/10] drm/i915: Only use one link bw config for MST topologies Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` [PATCH v6 08/10] drm/i915: Make intel_dp_mst_atomic_check() idempotent Lyude Paul 2018-04-11 19:29 ` Lyude Paul 2018-04-11 19:29 ` [PATCH v6 09/10] drm/dp_mst: Add MST fallback retraining helpers Lyude Paul 2018-04-11 19:29 ` [PATCH v6 10/10] drm/i915: Implement proper fallback training for MST Lyude Paul 2018-04-11 19:40 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2018-04-11 19:57 ` ✓ Fi.CI.BAT: success " Patchwork 2018-04-11 23:02 ` ✓ 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=20180411192951.21997-7-lyude@redhat.com \ --to=lyude@redhat.com \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=gustavo@padovan.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=manasi.d.navare@intel.com \ --cc=seanpaul@chromium.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.