From: Imre Deak <imre.deak@intel.com> To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Subject: [PATCH v2 12/17] drm/display/dp_mst: Add helpers to query payload allocation properties Date: Tue, 31 Jan 2023 17:05:43 +0200 [thread overview] Message-ID: <20230131150548.1614458-13-imre.deak@intel.com> (raw) In-Reply-To: <20230131150548.1614458-1-imre.deak@intel.com> Add helper functions to query the virtual channel and time slots for a payload and the current payload count and total allocated time slots in an MST topology. These are needed by a follow-up i915 patch verifying the SW vs. HW state of the MST topology. Cc: Lyude Paul <lyude@redhat.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: dri-devel@lists.freedesktop.org Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 36 +++++++++++++++++++ include/drm/display/drm_dp_mst_helper.h | 21 +++++++++++ 2 files changed, 57 insertions(+) diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index f2081f3fad0da..47605f67578ad 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3448,6 +3448,42 @@ bool drm_dp_mst_has_payload_alloc_errors(const struct drm_dp_mst_topology_state } EXPORT_SYMBOL(drm_dp_mst_has_payload_alloc_errors); +/** + * drm_dp_mst_payload_vchannel - Return the DP virtual channel for a payload + * @mst_state: The MST atomic state containing @payload + * @payload: The payload to get the virtual channel for + * + * Return the DP virtual channel for @payload. The virtual channel is a + * contiguous range of MST Transmission Units on the DP main lanes between + * the source DPTX and the first downstream MST hub DPRX. Accordingly the + * channel is determined by the payload's position on the payload list + * ordered by VC start slot. + * + * Returns the 0-based virtual channel of @payload if it's in @mst_state with + * its time slots being allocated, or -1 otherwise. + */ +int drm_dp_mst_payload_vchannel(const struct drm_dp_mst_topology_state *mst_state, + const struct drm_dp_mst_atomic_payload *payload) +{ + struct drm_dp_mst_atomic_payload *pos; + int vc = 0; + bool found = false; + + list_for_each_entry(pos, &mst_state->payloads, next) { + if (pos->vc_start_slot == -1) + continue; + + if (pos == payload) + found = true; + + if (pos->vc_start_slot < payload->vc_start_slot) + vc++; + } + + return found ? vc : -1; +} +EXPORT_SYMBOL(drm_dp_mst_payload_vchannel); + static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int offset, int size, u8 *bytes) diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h index 53b251b264e89..bb7c595096fed 100644 --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -846,6 +846,27 @@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr, const struct drm_dp_mst_atomic_payload *old_payload, struct drm_dp_mst_atomic_payload *new_payload); bool drm_dp_mst_has_payload_alloc_errors(const struct drm_dp_mst_topology_state *mst_state); +int drm_dp_mst_payload_vchannel(const struct drm_dp_mst_topology_state *mst_state, + const struct drm_dp_mst_atomic_payload *payload); + +static inline int +drm_dp_mst_payload_count(const struct drm_dp_mst_topology_state *mst_state) +{ + return mst_state->mgr->payload_count; +} + +static inline int +drm_dp_mst_allocated_time_slots(const struct drm_dp_mst_topology_state *mst_state) +{ + return drm_dp_mst_payload_count(mst_state) ? + mst_state->mgr->next_start_slot - mst_state->start_slot : 0; +} + +static inline int +drm_dp_mst_payload_time_slots(const struct drm_dp_mst_atomic_payload *payload) +{ + return payload->time_slots; +} int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr); -- 2.37.1
WARNING: multiple messages have this Message-ID (diff)
From: Imre Deak <imre.deak@intel.com> To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH v2 12/17] drm/display/dp_mst: Add helpers to query payload allocation properties Date: Tue, 31 Jan 2023 17:05:43 +0200 [thread overview] Message-ID: <20230131150548.1614458-13-imre.deak@intel.com> (raw) In-Reply-To: <20230131150548.1614458-1-imre.deak@intel.com> Add helper functions to query the virtual channel and time slots for a payload and the current payload count and total allocated time slots in an MST topology. These are needed by a follow-up i915 patch verifying the SW vs. HW state of the MST topology. Cc: Lyude Paul <lyude@redhat.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: dri-devel@lists.freedesktop.org Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 36 +++++++++++++++++++ include/drm/display/drm_dp_mst_helper.h | 21 +++++++++++ 2 files changed, 57 insertions(+) diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index f2081f3fad0da..47605f67578ad 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3448,6 +3448,42 @@ bool drm_dp_mst_has_payload_alloc_errors(const struct drm_dp_mst_topology_state } EXPORT_SYMBOL(drm_dp_mst_has_payload_alloc_errors); +/** + * drm_dp_mst_payload_vchannel - Return the DP virtual channel for a payload + * @mst_state: The MST atomic state containing @payload + * @payload: The payload to get the virtual channel for + * + * Return the DP virtual channel for @payload. The virtual channel is a + * contiguous range of MST Transmission Units on the DP main lanes between + * the source DPTX and the first downstream MST hub DPRX. Accordingly the + * channel is determined by the payload's position on the payload list + * ordered by VC start slot. + * + * Returns the 0-based virtual channel of @payload if it's in @mst_state with + * its time slots being allocated, or -1 otherwise. + */ +int drm_dp_mst_payload_vchannel(const struct drm_dp_mst_topology_state *mst_state, + const struct drm_dp_mst_atomic_payload *payload) +{ + struct drm_dp_mst_atomic_payload *pos; + int vc = 0; + bool found = false; + + list_for_each_entry(pos, &mst_state->payloads, next) { + if (pos->vc_start_slot == -1) + continue; + + if (pos == payload) + found = true; + + if (pos->vc_start_slot < payload->vc_start_slot) + vc++; + } + + return found ? vc : -1; +} +EXPORT_SYMBOL(drm_dp_mst_payload_vchannel); + static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int offset, int size, u8 *bytes) diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h index 53b251b264e89..bb7c595096fed 100644 --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -846,6 +846,27 @@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr, const struct drm_dp_mst_atomic_payload *old_payload, struct drm_dp_mst_atomic_payload *new_payload); bool drm_dp_mst_has_payload_alloc_errors(const struct drm_dp_mst_topology_state *mst_state); +int drm_dp_mst_payload_vchannel(const struct drm_dp_mst_topology_state *mst_state, + const struct drm_dp_mst_atomic_payload *payload); + +static inline int +drm_dp_mst_payload_count(const struct drm_dp_mst_topology_state *mst_state) +{ + return mst_state->mgr->payload_count; +} + +static inline int +drm_dp_mst_allocated_time_slots(const struct drm_dp_mst_topology_state *mst_state) +{ + return drm_dp_mst_payload_count(mst_state) ? + mst_state->mgr->next_start_slot - mst_state->start_slot : 0; +} + +static inline int +drm_dp_mst_payload_time_slots(const struct drm_dp_mst_atomic_payload *payload) +{ + return payload->time_slots; +} int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr); -- 2.37.1
next prev parent reply other threads:[~2023-01-31 15:06 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-31 15:05 [Intel-gfx] [PATCH v2 00/17] drm/i915: drm/i915/dp_mst: Fix MST payload removal during output disabling Imre Deak 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 01/17] drm/i915/dp_mst: Add the MST topology state for modesetted CRTCs Imre Deak 2023-01-31 15:05 ` Imre Deak 2023-01-31 15:05 ` [PATCH v2 02/17] drm/display/dp_mst: Handle old/new payload states in drm_dp_remove_payload() Imre Deak 2023-01-31 15:05 ` Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-01-31 23:13 ` Lyude Paul 2023-01-31 23:13 ` Lyude Paul 2023-01-31 23:13 ` [Intel-gfx] " Lyude Paul 2023-02-01 15:04 ` Imre Deak 2023-02-01 15:04 ` Imre Deak 2023-02-01 15:04 ` [Intel-gfx] " Imre Deak 2023-02-07 0:42 ` Lyude Paul 2023-02-07 0:42 ` Lyude Paul 2023-02-07 0:42 ` Lyude Paul 2023-02-07 12:11 ` Imre Deak 2023-02-07 12:11 ` [Intel-gfx] " Imre Deak 2023-02-07 12:11 ` Imre Deak 2023-02-08 0:21 ` [Intel-gfx] " Lyude Paul 2023-02-08 0:21 ` Lyude Paul 2023-02-08 0:21 ` Lyude Paul 2023-02-08 7:41 ` Imre Deak 2023-02-08 7:41 ` [Intel-gfx] " Imre Deak 2023-02-08 7:41 ` Imre Deak 2023-02-09 21:43 ` Lyude Paul 2023-02-09 21:43 ` [Intel-gfx] " Lyude Paul 2023-02-09 21:43 ` Lyude Paul 2023-01-31 15:05 ` [PATCH v2 03/17] drm/display/dp_mst: Add drm_atomic_get_old_mst_topology_state() Imre Deak 2023-01-31 15:05 ` Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 04/17] drm/i915/dp_mst: Fix payload removal during output disabling Imre Deak 2023-01-31 15:05 ` Imre Deak 2023-01-31 15:05 ` [PATCH v2 05/17] drm/display/dp_mst: Fix the payload VCPI check in drm_dp_mst_dump_topology() Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 06/17] drm/display/dp_mst: Sanitize payload iteration " Imre Deak 2023-01-31 23:14 ` Lyude Paul 2023-02-03 12:22 ` Ville Syrjälä 2023-02-03 13:12 ` Imre Deak 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 07/17] drm/i915: Factor out helpers for modesetting CRTCs and connectors Imre Deak 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 08/17] drm/i915/dp_mst: Move getting the MST topology state earlier to connector check Imre Deak 2023-01-31 15:05 ` [PATCH v2 09/17] drm/display/dp_mst: Add a helper to verify the MST payload state Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 10/17] drm/i915/dp_mst: Verify the MST state of modesetted outputs Imre Deak 2023-01-31 15:05 ` [PATCH v2 11/17] drm/display/dp_mst: Add helpers to query for payload allocation errors Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-02-02 10:13 ` kernel test robot 2023-02-02 12:15 ` [Intel-gfx] " Dan Carpenter 2023-02-02 12:15 ` Dan Carpenter 2023-02-02 12:15 ` Dan Carpenter 2023-02-02 12:35 ` Imre Deak 2023-02-02 12:35 ` [Intel-gfx] " Imre Deak 2023-02-02 12:35 ` Imre Deak 2023-01-31 15:05 ` Imre Deak [this message] 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 12/17] drm/display/dp_mst: Add helpers to query payload allocation properties Imre Deak 2023-01-31 15:05 ` [PATCH v2 13/17] drm/display/dp_mst: Export the DP_PAYLOAD_TABLE_SIZE definition Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-01-31 15:05 ` [PATCH v2 14/17] drm/display/dp_mst: Factor out a helper to reset the payload table Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-01-31 15:05 ` [PATCH v2 15/17] drm/dp: Add a quirk for a DELL P2715Q MST payload allocation problem Imre Deak 2023-01-31 15:05 ` [Intel-gfx] " Imre Deak 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 16/17] drm/i915/dp_mst: Add workaround for a DELL P2715Q " Imre Deak 2023-01-31 22:47 ` Lyude Paul 2023-02-01 14:41 ` Imre Deak 2023-01-31 23:43 ` Lyude Paul 2023-01-31 15:05 ` [Intel-gfx] [PATCH v2 17/17] drm/i915/dp_mst: Verify the HW state of MST encoders Imre Deak 2023-02-01 9:41 ` Jani Nikula 2023-02-01 14:03 ` Imre Deak 2023-01-31 15:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: drm/i915/dp_mst: Fix MST payload removal during output disabling Patchwork 2023-01-31 15:59 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2023-01-31 20:42 ` [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=20230131150548.1614458-13-imre.deak@intel.com \ --to=imre.deak@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /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.