From: Fangzhi Zuo <Jerry.Zuo@amd.com>
To: <dri-devel@lists.freedesktop.org>
Cc: <lyude@redhat.com>, <harry.wentland@amd.com>,
<Nicholas.Kazlauskas@amd.com>, <wayne.lin@amd.com>,
Fangzhi Zuo <Jerry.Zuo@amd.com>
Subject: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
Date: Fri, 27 Aug 2021 19:43:21 -0400 [thread overview]
Message-ID: <20210827234322.2740301-2-Jerry.Zuo@amd.com> (raw)
In-Reply-To: <20210827234322.2740301-1-Jerry.Zuo@amd.com>
8b/10b encoding format requires to reserve the first slot for
recording metadata. Real data transmission starts from the second slot,
with a total of available 63 slots available.
In 128b/132b encoding format, metadata is transmitted separately
in LLCP packet before MTP. Real data transmission starts from
the first slot, with a total of 64 slots available.
Signed-off-by: Fangzhi Zuo <Jerry.Zuo@amd.com>
---
drivers/gpu/drm/drm_dp_mst_topology.c | 27 ++++++++++++++++++++-------
include/drm/drm_dp_mst_helper.h | 9 +++++++++
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 86d13d6bc463..30544801d2b8 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -3370,7 +3370,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
struct drm_dp_payload req_payload;
struct drm_dp_mst_port *port;
int i, j;
- int cur_slots = 1;
+ int cur_slots = mgr->start_slot;
bool skip;
mutex_lock(&mgr->payload_lock);
@@ -4323,7 +4323,7 @@ int drm_dp_find_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr,
num_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
/* max. time slots - one slot for MTP header */
- if (num_slots > 63)
+ if (num_slots > mgr->total_avail_slots)
return -ENOSPC;
return num_slots;
}
@@ -4335,7 +4335,7 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
int ret;
/* max. time slots - one slot for MTP header */
- if (slots > 63)
+ if (slots > mgr->total_avail_slots)
return -ENOSPC;
vcpi->pbn = pbn;
@@ -4509,6 +4509,17 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
}
EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);
+void drm_dp_mst_update_encoding_cap(struct drm_dp_mst_topology_mgr *mgr, uint8_t link_encoding_cap)
+{
+ if (link_encoding_cap == DP_CAP_ANSI_128B132B) {
+ mgr->total_avail_slots = 64;
+ mgr->start_slot = 0;
+ }
+ DRM_DEBUG_KMS("%s encoding format determined\n",
+ (link_encoding_cap == DP_CAP_ANSI_128B132B) ? "128b/132b" : "8b/10b");
+}
+EXPORT_SYMBOL(drm_dp_mst_update_encoding_cap);
+
/**
* drm_dp_mst_allocate_vcpi() - Allocate a virtual channel
* @mgr: manager for this port
@@ -4540,8 +4551,8 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
ret = drm_dp_init_vcpi(mgr, &port->vcpi, pbn, slots);
if (ret) {
- drm_dbg_kms(mgr->dev, "failed to init vcpi slots=%d max=63 ret=%d\n",
- DIV_ROUND_UP(pbn, mgr->pbn_div), ret);
+ drm_dbg_kms(mgr->dev, "failed to init vcpi slots=%d max=%d ret=%d\n",
+ DIV_ROUND_UP(pbn, mgr->pbn_div), mgr->total_avail_slots, ret);
drm_dp_mst_topology_put_port(port);
goto out;
}
@@ -5228,7 +5239,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_topology_state *mst_state)
{
struct drm_dp_vcpi_allocation *vcpi;
- int avail_slots = 63, payload_count = 0;
+ int avail_slots = mgr->total_avail_slots, payload_count = 0;
list_for_each_entry(vcpi, &mst_state->vcpis, next) {
/* Releasing VCPI is always OK-even if the port is gone */
@@ -5257,7 +5268,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(struct drm_dp_mst_topology_mgr *mgr,
}
}
drm_dbg_atomic(mgr->dev, "[MST MGR:%p] mst state %p VCPI avail=%d used=%d\n",
- mgr, mst_state, avail_slots, 63 - avail_slots);
+ mgr, mst_state, avail_slots, mgr->total_avail_slots - avail_slots);
return 0;
}
@@ -5529,6 +5540,8 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
if (!mgr->proposed_vcpis)
return -ENOMEM;
set_bit(0, &mgr->payload_mask);
+ mgr->total_avail_slots = 63;
+ mgr->start_slot = 1;
mst_state = kzalloc(sizeof(*mst_state), GFP_KERNEL);
if (mst_state == NULL)
diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index ddb9231d0309..eac5ce48f214 100644
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -661,6 +661,15 @@ struct drm_dp_mst_topology_mgr {
*/
int pbn_div;
+ /**
+ * @total_avail_slots: available slots for data transmission
+ */
+ u8 total_avail_slots;
+ /**
+ * @start_slot: first slot index for data transmission
+ */
+ u8 start_slot;
+
/**
* @funcs: Atomic helper callbacks
*/
--
2.25.1
next prev parent reply other threads:[~2021-08-28 0:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 23:43 [PATCH 0/2] Update 128b/132b MST Slot Information Fangzhi Zuo
2021-08-27 23:43 ` Fangzhi Zuo [this message]
2021-08-28 4:09 ` [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format kernel test robot
2021-08-30 20:00 ` Lyude Paul
2021-08-31 19:44 ` Zuo, Jerry
2021-08-31 20:19 ` Lyude Paul
2021-08-31 22:44 ` Lyude Paul
2021-10-12 21:58 ` [PATCH] " Bhawanpreet Lakha
2021-10-12 22:02 ` Lakha, Bhawanpreet
2021-10-12 22:09 ` Lyude Paul
2021-10-13 16:09 ` Jani Nikula
2021-10-13 19:33 ` Bhawanpreet Lakha
2021-10-13 19:37 ` Lyude Paul
2021-10-13 18:52 ` kernel test robot
2021-10-13 21:54 ` kernel test robot
2021-10-13 22:25 ` Lyude Paul
2021-10-14 20:21 ` Bhawanpreet Lakha
2021-10-14 20:22 ` Bhawanpreet Lakha
2021-10-15 20:04 ` Lyude Paul
2021-10-15 19:43 ` Bhawanpreet Lakha
2021-10-15 20:41 ` Lyude Paul
2021-10-18 19:47 ` Bhawanpreet Lakha
2021-10-18 23:17 ` Lyude Paul
2021-10-19 18:01 ` [PATCH 2/4] " Bhawanpreet Lakha
2021-10-20 8:34 ` Jani Nikula
2021-08-31 22:45 ` [PATCH 1/2] " Lyude Paul
2021-08-31 22:46 ` Lyude Paul
2021-08-27 23:43 ` [PATCH 2/2] drm/amdgpu: Example Usage in AMDGPU Fangzhi Zuo
2021-08-28 11:54 ` kernel test robot
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=20210827234322.2740301-2-Jerry.Zuo@amd.com \
--to=jerry.zuo@amd.com \
--cc=Nicholas.Kazlauskas@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=lyude@redhat.com \
--cc=wayne.lin@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;
as well as URLs for NNTP newsgroup(s).