Update 128b/132b MST Slot Information
Subsystems (7)
cover Update 128b/132b MST Slot Information
128b/132b MST start slot information is not the same as 8b/10b. Update based on encoding format after link detection or topology change.
Fangzhi Zuo (2):
drm: Update MST First Link Slot Information Based on Encoding Format drm/amdgpu: Example Usage in AMDGPU
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +++++++ .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 2 ++ drivers/gpu/drm/drm_dp_mst_topology.c | 27 ++++++++++++++----- include/drm/drm_dp_mst_helper.h | 9 +++++++ 5 files changed, 44 insertions(+), 8 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 drm: Update MST First Link Slot Information Based on Encoding Format
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.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 27 ++++++++++++++++++++------- include/drm/drm_dp_mst_helper.h | 9 +++++++++ 2 files changed, 29 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +20 -7
@@ -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 )
include/drm/drm_dp_mst_helper.h +9 -0
@@ -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 */
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
Thank you for the patch! Perhaps something to improve:
Hi Fangzhi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master v5.14-rc7 next-20210827] [cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Fangzhi-Zuo/Update-128b-132b-MST-Slot-Information/20210828-082044 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: parisc-randconfig-r002-20210827 (attached as .config) compiler: hppa-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/8232240b519fadd6ad9eb814925e513a15407474
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Fangzhi-Zuo/Update-128b-132b-MST-Slot-Information/20210828-082044 git checkout 8232240b519fadd6ad9eb814925e513a15407474
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=parisc
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/drm_dp_mst_topology.c:4512:6: warning: no previous prototype for 'drm_dp_mst_update_encoding_cap' [-Wmissing-prototypes]
4512 | void drm_dp_mst_update_encoding_cap(struct drm_dp_mst_topology_mgr *mgr, uint8_t link_encoding_cap)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/drm_dp_mst_update_encoding_cap +4512 drivers/gpu/drm/drm_dp_mst_topology.c
4511
> 4512 void drm_dp_mst_update_encoding_cap(struct drm_dp_mst_topology_mgr *mgr, uint8_t link_encoding_cap)
4513 {
4514 if (link_encoding_cap == DP_CAP_ANSI_128B132B) {
4515 mgr->total_avail_slots = 64;
4516 mgr->start_slot = 0;
4517 }
4518 DRM_DEBUG_KMS("%s encoding format determined\n",
4519 (link_encoding_cap == DP_CAP_ANSI_128B132B) ? "128b/132b" : "8b/10b");
4520 }
4521 EXPORT_SYMBOL(drm_dp_mst_update_encoding_cap);
4522
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Lyude Paul
maintainerRe: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Fangzhi ZuoQuoted 64 lines · Fangzhi Zuo
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 <[email protected]>---
drivers/gpu/drm/drm_dp_mst_topology.c | 27 ++++++++++++++++++++------- include/drm/drm_dp_mst_helper.h | 9 +++++++++2 files changed, 29 insertions(+), 7 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -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);drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4323,7 +4323,7 @@ int drm_dp_find_vcpi_slots(structdrm_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;
returnnum_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4335,7 +4335,7 @@ static int drm_dp_init_vcpi(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4509,6 +4509,17 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);
+voiddrm_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");
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4522
Quoted 3 lines
drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+} +EXPORT_SYMBOL (drm_dp_mst_update_encoding_cap); +
This seems to be missing kdocs, can you fix that?
Also - I'm not convinced this is all of the work we have to do, as there's no locking taking place here in this function. If we're changing the number of available VCPI slots that we have, we need to be able to factor that into the atomic check logic which means that we can't rely on mgr->* for any kind of data that isn't guaranteed to remain consistent throughout the lifetime of the driver or topology. (Note that some of the old MST code didn't follow this logic, so I wouldn't be surprised if there's still exceptions to this we need to clean up).
Note that I still expect we'll have to keep some sort of track of the current total slot count in the topology mgr, but that should be reflecting the currently programmed state and not be relied on from our atomic check.
IMHO - the correct way we should go about adding support for this is to add something into drm_dp_mst_topology_state and integrate this into the atomic check helpers.
Quoted 72 lines
/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -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-Quoted 1 line
total_avail_slots, ret);drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -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)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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 */drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -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;
}drivers/gpu/drm/drm_dp_mst_topology.c +2
-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)include/drm/drm_dp_mst_helper.h +0
-0@@ -661,6 +661,15 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;
+ /**
+ * @total_avail_slots: available slots for data transmission + */
+ u8total_avail_slots;
+ /**
+ * @start_slot: first slot index for data transmission + */
+ u8start_slot;
+
/**
* @funcs: Atomic helper callbacks
*/
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
RE: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
[AMD Official Use Only]
Quoted 91 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: August 30, 2021 4:00 PM
To: Zuo, Jerry <[email protected]>; [email protected]
Cc: Wentland, Harry <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Lin, Wayne <[email protected]>
Subject: Re: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding FormatQuoted 50 lines · Fangzhi Zuo
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 <[email protected]>--- drivers/gpu/drm/drm_dp_mst_topology.c | 27 ++++++++++++++++++++------- include/drm/drm_dp_mst_helper.h | 9 +++++++++ 2 files changed, 29 insertions(+), 7 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -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 */drivers/gpu/drm/drm_dp_mst_topology.c +2
-2-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(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct · line 4513
Quoted 5 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-0@@ -4509,6 +4509,17 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, }EXPORT_SYMBOL (drm_dp_atomic_release_vcpi_slots ); +void drm_dp_mst_update_encoding_cap(struct
drm_dp_mst_topology_mgrdrivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4522
Quoted 13 lines
drivers/gpu/drm/drm_dp_mst_topology.c +11
-0+*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); +This seems to be missing kdocs, can you fix that?
Also - I'm not convinced this is all of the work we have to do, as there's no locking taking place here in this function. If we're changing the number of available VCPI slots that we have, we need to be able to factor that into the atomic check logic which means that we can't rely on mgr->* for any kind of data that isn't guaranteed to remain consistent throughout the lifetime of the driver or topology. (Note that some of the old MST code didn't follow this logic, so I wouldn't be surprised if there's still exceptions to this we need to clean up).
Quoted 4 lines
Note that I still expect we'll have to keep some sort of track of the current total slot count in the topology mgr, but that should be reflecting the currently programmed state and not be relied on from our atomic check.
Thanks Lyude for your comments.
Seems I should keep existing code to keep track of current slot status in mgr. That information is getting updated each time when topology change detected. That slot information saved in mgr is a sort of static, and could only be used for debug purpose to track what is the current encoding format.
Quoted 3 lines
IMHO - the correct way we should go about adding support for this is to add something into
drm_dp_mst_topology_stateand integrate this into the atomic check helpers.
The slot information should also be added into drm_dp_mst_topology_state to reflect the real-time slot status.
I'd like to confirm the best place to get slot count info. updated. Should the update be done within &drm_mode_config_funcs. atomic_check(), before new stream is created, OR
should be updated within drm_dp_mst_atomic_check() ?
The updated slot count will be used in drm_dp_mst_atomic_check() to check slot limit, and in drm_dp_update_payload_part1() as initial cur_slots.
Quoted 83 lines
drivers/gpu/drm/drm_dp_mst_topology.c
Quoted 21 lines
/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +3
-2@@ -4540,8 +4551,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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-Quoted 1 line
total_avail_slots, ret);drm_dp_mst_topology_put_port(port); goto out; }drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5228,7 +5239,7 @@drm_dp_mst_atomic_check_vcpi_alloc_limit(struct
Quoted 46 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0drm_dp_mst_topology_mgr *mgr, struct
drm_dp_mst_topology_state*mst_state){ struct drm_dp_vcpi_allocation *vcpi;drivers/gpu/drm/drm_dp_mst_topology.c +1
-1-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(structdrm_dp_mst_topology_mgr*mgr,} } drm_dbg_atomic(mgr->dev, "[MST MGR:%p] mst state %p VCPIavail=%d used=%d\n",
drivers/gpu/drm/drm_dp_mst_topology.c +2
-1- mgr, mst_state, avail_slots, 63 - avail_slots); + mgr, mst_state, avail_slots, +mgr->total_avail_slots -
avail_slots);return 0;}
drivers/gpu/drm/drm_dp_mst_topology.c +2
-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)(quoted diff) +0
-0
b/include/drm/drm_dp_mst_helper.hindexddb9231d0309..eac5ce48f214100644include/drm/drm_dp_mst_helper.h +2
-0@@ -661,6 +661,15 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; +/** +* @total_avail_slots: available slots for data transmission include/drm/drm_dp_mst_helper.h struct drm_dp_mst_topology_mgr { · line 675
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +7
-0+*/ +u8 total_avail_slots; +/** +* @start_slot: first slot index for data transmission +*/ +u8 start_slot; +/** * @funcs: Atomic helper callbacks */ --
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Lyude Paul
maintainerRe: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
Quoted 105 lines · Jerry
[AMD Official Use Only]
Quoted 97 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: August 30, 2021 4:00 PM
To: Zuo, Jerry <[email protected]>; [email protected]
Cc: Wentland, Harry <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Lin, Wayne <[email protected]>
Subject: Re: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding FormatQuoted 50 lines · Fangzhi Zuo
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 <[email protected]>---
drivers/gpu/drm/drm_dp_mst_topology.c | 27
++++++++++++++++++++-------
include/drm/drm_dp_mst_helper.h | 9 +++++++++2 files changed, 29 insertions(+), 7 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -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(structdrm_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;
returnnum_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4335,7 +4335,7 @@ static int drm_dp_init_vcpi(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct · line 4513
Quoted 5 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-0@@ -4509,6 +4509,17 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots); +void drm_dp_mst_update_encoding_cap(struct
drm_dp_mst_topology_mgrdrivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4522
Quoted 13 lines
drivers/gpu/drm/drm_dp_mst_topology.c +11
-0+*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); +This seems to be missing kdocs, can you fix that?
Also - I'm not convinced this is all of the work we have to do, as there's no
locking taking place here in this function. If we're changing the number of
available VCPI slots that we have, we need to be able to factor that into the
atomic check logic which means that we can't rely on mgr->* for any kind of
data that isn't guaranteed to remain consistent throughout the lifetime of the
driver or topology. (Note that some of the old MST code didn't follow this logic, so I wouldn't be surprised if there's still exceptions to this we need to
clean up).Quoted 5 lines
Note that I still expect we'll have to keep some sort of track of the current
total slot count in the topology mgr, but that should be reflecting the currently programmed state and not be relied on from our atomic check.
Quoted 8 lines
Thanks Lyude for your comments.
Seems I should keep existing code to keep track of current slot status in mgr.
That information is getting updated each time when topology change detected. That slot information saved in mgr is a sort of static, and could only be used
for debug purpose to track what is the current encoding format.
Ahh - in that case maybe we should try getting rid of it (as we could just use the atomic state for debugging output anyway).
Quoted 6 lines
Quoted 5 lines
IMHO - the correct way we should go about adding support for this is to add
something intodrm_dp_mst_topology_stateand integrate this into the atomic check helpers.
Quoted 7 lines
The slot information should also be added into
drm_dp_mst_topology_stateto reflect the real-time slot status.I'd like to confirm the best place to get slot count info. updated. Should the update be done within
&drm_mode_config_funcs.atomic_check(), before new stream is created, OR
should be updated withindrm_dp_mst_atomic_check()?
drm_dp_mst_atomic_check() would be better, since I imagine that we have to do this for all drivers using MST
Quoted 89 lines
The updated slot count will be used in
drm_dp_mst_atomic_check()to check slot limit,
and indrm_dp_update_payload_part1()as initialcur_slots.Quoted 83 lines
drivers/gpu/drm/drm_dp_mst_topology.c
Quoted 21 lines
/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +3
-2@@ -4540,8 +4551,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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-Quoted 1 line
total_avail_slots, ret);
drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5228,7 +5239,7 @@drm_dp_mst_atomic_check_vcpi_alloc_limit(struct
Quoted 46 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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(structdrm_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;
}drivers/gpu/drm/drm_dp_mst_topology.c +2
-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)(quoted diff) +0
-0
b/include/drm/drm_dp_mst_helper.hindexddb9231d0309..eac5ce48f214100644include/drm/drm_dp_mst_helper.h +2
-0@@ -661,6 +661,15 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; + /** +* @total_avail_slots: available slots for data transmission include/drm/drm_dp_mst_helper.h struct drm_dp_mst_topology_mgr { · line 675
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +7
-0+*/ + u8 total_avail_slots; + /** + * @start_slot: first slot index for data transmission + */ + u8 start_slot; + /*** @funcs: Atomic helper callbacks */ --
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Lyude Paul
maintainerRe: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Zuo, Jerry(I am going to try responding to this tomorrow btw. I haven't been super busy this week, but this has been a surprisingly difficult email to respond to because I need to actually need to do a deep dive some of the MST helpers tomorrow to figure out more of the specifics on why I realized we couldn't just hot add/remove port->connector here).
Quoted 215 lines · Jerry
[AMD Official Use Only]
Quoted 97 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: August 30, 2021 4:00 PM
To: Zuo, Jerry <[email protected]>; [email protected]
Cc: Wentland, Harry <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Lin, Wayne <[email protected]>
Subject: Re: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding FormatQuoted 50 lines · Fangzhi Zuo
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 <[email protected]>---
drivers/gpu/drm/drm_dp_mst_topology.c | 27
++++++++++++++++++++-------
include/drm/drm_dp_mst_helper.h | 9 +++++++++2 files changed, 29 insertions(+), 7 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -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(structdrm_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;
returnnum_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4335,7 +4335,7 @@ static int drm_dp_init_vcpi(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct · line 4513
Quoted 5 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-0@@ -4509,6 +4509,17 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots); +void drm_dp_mst_update_encoding_cap(struct
drm_dp_mst_topology_mgrdrivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4522
Quoted 13 lines
drivers/gpu/drm/drm_dp_mst_topology.c +11
-0+*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); +This seems to be missing kdocs, can you fix that?
Also - I'm not convinced this is all of the work we have to do, as there's no
locking taking place here in this function. If we're changing the number of
available VCPI slots that we have, we need to be able to factor that into the
atomic check logic which means that we can't rely on mgr->* for any kind of
data that isn't guaranteed to remain consistent throughout the lifetime of the
driver or topology. (Note that some of the old MST code didn't follow this logic, so I wouldn't be surprised if there's still exceptions to this we need to
clean up).Quoted 5 lines
Note that I still expect we'll have to keep some sort of track of the current
total slot count in the topology mgr, but that should be reflecting the currently programmed state and not be relied on from our atomic check.Thanks Lyude for your comments.
Seems I should keep existing code to keep track of current slot status in mgr.
That information is getting updated each time when topology change detected. That slot information saved in mgr is a sort of static, and could only be used
for debug purpose to track what is the current encoding format.Quoted 4 lines
IMHO - the correct way we should go about adding support for this is to add
something intodrm_dp_mst_topology_stateand integrate this into the atomic check helpers.The slot information should also be added into
drm_dp_mst_topology_stateto reflect the real-time slot status.I'd like to confirm the best place to get slot count info. updated. Should the update be done within
&drm_mode_config_funcs.atomic_check(), before new stream is created, OR
should be updated withindrm_dp_mst_atomic_check()?The updated slot count will be used in
drm_dp_mst_atomic_check()to check slot limit,
and indrm_dp_update_payload_part1()as initialcur_slots.Quoted 83 lines
drivers/gpu/drm/drm_dp_mst_topology.c
Quoted 21 lines
/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +3
-2@@ -4540,8 +4551,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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-Quoted 1 line
total_avail_slots, ret);
drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5228,7 +5239,7 @@drm_dp_mst_atomic_check_vcpi_alloc_limit(struct
Quoted 46 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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(structdrm_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;
}drivers/gpu/drm/drm_dp_mst_topology.c +2
-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)(quoted diff) +0
-0
b/include/drm/drm_dp_mst_helper.hindexddb9231d0309..eac5ce48f214100644include/drm/drm_dp_mst_helper.h +2
-0@@ -661,6 +661,15 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; + /** +* @total_avail_slots: available slots for data transmission include/drm/drm_dp_mst_helper.h struct drm_dp_mst_topology_mgr { · line 675
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +7
-0+*/ + u8 total_avail_slots; + /** + * @start_slot: first slot index for data transmission + */ + u8 start_slot; + /*** @funcs: Atomic helper callbacks */ --
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
PATCH 1/1 drm: Update MST First Link Slot Information Based on Encoding Format
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.
v2:
* Remove get_mst_link_encoding_cap
* Move total/start slots to mst_state, and copy it to mst_mgr in atomic_check
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++ 3 files changed, 69 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28 -0
@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )struct dsc_mst_fairness_vars vars[MAX_PIPES ];#endif +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_mst_topology_mgr *mgr;trace_amdgpu_dm_atomic_check_begin (state);
@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; } +#if defined(CONFIG_DRM_AMD_DC_DCN ) +for_each_new_mst_mgr_in_state (state, mgr, mst_state, i) { +struct amdgpu_dm_connector *aconnector; +struct drm_connector *connector; +struct drm_connector_list_iter iter; +u8 link_coding_cap; + +if (!mgr->mst_state ) +continue ; + +drm_connector_list_iter_begin (dev, &iter); +drm_for_each_connector_iter (connector, &iter) { +int id = connector->index; + +if (id == mst_state->mgr->conn_base_id) { + aconnector =to_amdgpu_dm_connector (connector); + link_coding_cap =dc_link_dp_mst_decide_link_encoding_format (aconnector->dc_link); +drm_dp_mst_update_coding_cap (mst_state, link_coding_cap); + +break ; + } + } +drm_connector_list_iter_end (&iter); + + } +#endif /** * Streams and planes are reset when there are changes that affect * bandwidth. Anything that affects bandwidth needs to go through
drivers/gpu/drm/drm_dp_mst_topology.c +28 -7
@@ -3368,7 +3368,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);
@@ -4321,7 +4321,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; }
@@ -4333,7 +4333,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;
@@ -4507,6 +4507,18 @@ 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_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap) +{ +if (link_coding_cap ==DP_CAP_ANSI_128B132B ) { + mst_state->total_avail_slots =64 ; + mst_state->start_slot =0 ; + } + +DRM_DEBUG_KMS ("%s coding format on mgr 0x%p\n" , + (link_coding_cap ==DP_CAP_ANSI_128B132B ) ?"128b/132b" :"8b/10b" , mst_state->mgr); +} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/** * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel * @mgr: manager for this port
@@ -4538,8 +4550,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; }
@@ -5226,7 +5238,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 */
@@ -5255,7 +5267,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 ; }
@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state)break ;mutex_lock (&mgr->lock); + + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; + ret =drm_dp_mst_atomic_check_mstb_bw_limit (mgr->mst_primary, mst_state);mutex_unlock (&mgr->lock);
@@ -5527,11 +5543,16 @@ 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 )return -ENOMEM ; + mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; + mst_state->mgr = mgr;INIT_LIST_HEAD (&mst_state->vcpis);
include/drm/drm_dp_mst_helper.h +13 -0
@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state {struct drm_private_state base;struct list_head vcpis;struct drm_dp_mst_topology_mgr *mgr; +u8 total_avail_slots; +u8 start_slot; };#define to_dp_mst_topology_mgr (x) container_of(x, struct drm_dp_mst_topology_mgr, base)
@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; +/** +* @total_avail_slots: 63 for 8b/10b, 64 for 128/132b +*/ +u8 total_avail_slots; + +/** +* @start_slot: 1 for 8b/10b, 0 for 128/132b +*/ +u8 start_slot; +/** * @funcs: Atomic helper callbacks */
@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dpvoid drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_update_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap);void drm_dp_mst_deallocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);
Signature · 1 line
2.25.1
Re: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
[AMD Official Use Only]
Hi Lyude,
Jerry is busy these few weeks so I will be taking a look at this. I added the start/total slots to the mst_state and am updating them in atomic_check.
Also ignore the V2 "* Remove get_mst_link_encoding_cap" I got a bit lost in trying to figure out the patch layout that was sent before.
Thanks,
Bhawan
________________________________
From: Bhawanpreet Lakha <[email protected]>
Sent: October 12, 2021 5:58 PM
To: Zuo, Jerry <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>
Cc: Wentland, Harry <[email protected]>; Lin, Wayne <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Lakha, Bhawanpreet <[email protected]>
Subject: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
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.
v2:
* Remove get_mst_link_encoding_cap
* Move total/start slots to mst_state, and copy it to mst_mgr in atomic_check
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++ 3 files changed, 69 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28 -0
@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )struct dsc_mst_fairness_vars vars[MAX_PIPES ];#endif +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_mst_topology_mgr *mgr;trace_amdgpu_dm_atomic_check_begin (state);
@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; } +#if defined(CONFIG_DRM_AMD_DC_DCN ) +for_each_new_mst_mgr_in_state (state, mgr, mst_state, i) { +struct amdgpu_dm_connector *aconnector; +struct drm_connector *connector; +struct drm_connector_list_iter iter; +u8 link_coding_cap; + +if (!mgr->mst_state ) +continue ; + +drm_connector_list_iter_begin (dev, &iter); +drm_for_each_connector_iter (connector, &iter) { +int id = connector->index; + +if (id == mst_state->mgr->conn_base_id) { + aconnector =to_amdgpu_dm_connector (connector); + link_coding_cap =dc_link_dp_mst_decide_link_encoding_format (aconnector->dc_link); +drm_dp_mst_update_coding_cap (mst_state, link_coding_cap); + +break ; + } + } +drm_connector_list_iter_end (&iter); + + } +#endif /** * Streams and planes are reset when there are changes that affect * bandwidth. Anything that affects bandwidth needs to go through
drivers/gpu/drm/drm_dp_mst_topology.c +28 -7
@@ -3368,7 +3368,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);
@@ -4321,7 +4321,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; }
@@ -4333,7 +4333,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;
@@ -4507,6 +4507,18 @@ 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_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap) +{ +if (link_coding_cap ==DP_CAP_ANSI_128B132B ) { + mst_state->total_avail_slots =64 ; + mst_state->start_slot =0 ; + } + +DRM_DEBUG_KMS ("%s coding format on mgr 0x%p\n" , + (link_coding_cap ==DP_CAP_ANSI_128B132B ) ?"128b/132b" :"8b/10b" , mst_state->mgr); +} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/** * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel * @mgr: manager for this port
@@ -4538,8 +4550,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; }
@@ -5226,7 +5238,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 */
@@ -5255,7 +5267,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 ; }
@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state)break ;mutex_lock (&mgr->lock); + + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; + ret =drm_dp_mst_atomic_check_mstb_bw_limit (mgr->mst_primary, mst_state);mutex_unlock (&mgr->lock);
@@ -5527,11 +5543,16 @@ 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 )return -ENOMEM ; + mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; + mst_state->mgr = mgr;INIT_LIST_HEAD (&mst_state->vcpis);
include/drm/drm_dp_mst_helper.h +13 -0
@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state {struct drm_private_state base;struct list_head vcpis;struct drm_dp_mst_topology_mgr *mgr; +u8 total_avail_slots; +u8 start_slot; };#define to_dp_mst_topology_mgr (x) container_of(x, struct drm_dp_mst_topology_mgr, base)
@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; +/** +* @total_avail_slots: 63 for 8b/10b, 64 for 128/132b +*/ +u8 total_avail_slots; + +/** +* @start_slot: 1 for 8b/10b, 0 for 128/132b +*/ +u8 start_slot; +/** * @funcs: Atomic helper callbacks */
@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dpvoid drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_update_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap);void drm_dp_mst_deallocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);
--
2.25.1
Lyude Paul
maintainerRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
No problem, thanks for the patches! Will take a look at this tomorrow
Quoted 265 lines · Bhawanpreet
[AMD Official Use Only]
Hi Lyude,
Jerry is busy these few weeks so I will be taking a look at this. I added the start/total slots to the
mst_stateand am updating them inatomic_check.Also ignore the V2 "* Remove
get_mst_link_encoding_cap" I got a bit lost in trying to figure out the patch layout that was sent before.Thanks,
BhawanFrom: Bhawanpreet Lakha <[email protected]>
Sent: October 12, 2021 5:58 PM
To: Zuo, Jerry <[email protected]>; [email protected] <dri- [email protected]>; [email protected] <[email protected]>
Cc: Wentland, Harry <[email protected]>; Lin, Wayne <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Lakha, Bhawanpreet <[email protected]>
Subject: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
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.
v2:
* Removeget_mst_link_encoding_cap
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkSigned-off-by Fangzhi Zuo <[email protected]>Signed-off-by Bhawanpreet Lakha <[email protected]>---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++3 files changed, 69 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, #if defined(CONFIG_DRM_AMD_DC_DCN) struct dsc_mst_fairness_vars vars[MAX_PIPES]; #endif + struct drm_dp_mst_topology_state *mst_state; + struct drm_dp_mst_topology_mgr *mgr;
trace_amdgpu_dm_atomic_check_begin(state);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +16
-0+#if defined(CONFIG_DRM_AMD_DC_DCN) + for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) { + struct amdgpu_dm_connector *aconnector; + struct drm_connector *connector; + struct drm_connector_list_iter iter; + u8 link_coding_cap; + + if (!mgr->mst_state ) + continue; + + drm_connector_list_iter_begin(dev, &iter); + drm_for_each_connector_iter(connector, &iter) { + int id = connector->index; + + if (id == mst_state->mgr->conn_base_id) { + aconnector =
to_amdgpu_dm_connector(connector);
+link_coding_cap=dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link); +drm_dp_mst_update_coding_cap(mst_state, link_coding_cap);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-0+ + break; + } + } + drm_connector_list_iter_end(&iter); + + } +#endif /**
* Streams and planes are reset when there are changes that affect
* bandwidth. Anything that affects bandwidth needs to go throughdrivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -3368,7 +3368,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);drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4321,7 +4321,7 @@ int drm_dp_find_vcpi_slots(structdrm_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;
returnnum_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4333,7 +4333,7 @@ static int drm_dp_init_vcpi(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4507,6 +4507,18 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap)drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+{ + if (link_coding_cap == DP_CAP_ANSI_128B132B) { + mst_state->total_avail_slots = 64; + mst_state->start_slot = 0; + } + + DRM_DEBUG_KMS("%s coding format on mgr 0x%p\n", + (link_coding_cap == DP_CAP_ANSI_128B132B) ?"128b/132b":"8b/10b",
mst_state->mgr);drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4538,8 +4550,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-Quoted 1 line
total_avail_slots, ret);
drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5226,7 +5238,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(struct drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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 */drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5255,7 +5267,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;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state) break;
mutex_lock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +4
-0+ + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +2
-0@@ -5527,11 +5543,16 @@ 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)
return-ENOMEM;
+mst_state->total_avail_slots= 63;
+mst_state->start_slot= 1;
+
mst_state->mgr= mgr;INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; };
#defineto_dp_mst_topology_mgr(x)container_of(x, struct drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +0
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;
+ /**
+ * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */
+ u8total_avail_slots;include/drm/drm_dp_mst_helper.h +6
-0+ + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; +/**
* @funcs: Atomic helper callbacks
*/include/drm/drm_dp_mst_helper.h +0
-0@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dp
voiddrm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);
voiddrm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Jani Nikula
maintainerRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Bhawanpreet LakhaQuoted 54 lines · Bhawanpreet Lakha
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.
v2:
* Removeget_mst_link_encoding_cap
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkSigned-off-by Fangzhi Zuo <[email protected]>Signed-off-by Bhawanpreet Lakha <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++ 3 files changed, 69 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +18
-0@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )struct dsc_mst_fairness_vars vars[MAX_PIPES ];#endif +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_mst_topology_mgr *mgr;trace_amdgpu_dm_atomic_check_begin (state);@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; } +#if defined(CONFIG_DRM_AMD_DC_DCN ) +for_each_new_mst_mgr_in_state (state, mgr, mst_state, i) { +struct amdgpu_dm_connector *aconnector; +struct drm_connector *connector; +struct drm_connector_list_iter iter; +u8 link_coding_cap; + +if (!mgr->mst_state ) +continue ; + +drm_connector_list_iter_begin (dev, &iter); +drm_for_each_connector_iter (connector, &iter) { +int id = connector->index; + +if (id == mst_state->mgr->conn_base_id) { + aconnector =to_amdgpu_dm_connector (connector);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device *dev, · line 10849
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-0+ link_coding_cap =dc_link_dp_mst_decide_link_encoding_format (aconnector->dc_link); +drm_dp_mst_update_coding_cap (mst_state, link_coding_cap); + + break; + } + } +drm_connector_list_iter_end (&iter); + + } +#endif
I wonder if we could split this to separate drm dp helper and amd driver patches?
Quoted 35 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0/** * Streams and planes are reset when there are changes that affect * bandwidth. Anything that affects bandwidth needs to go through drivers/gpu/drm/drm_dp_mst_topology.c +3
-3@@ -3368,7 +3368,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);@@ -4321,7 +4321,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; }@@ -4333,7 +4333,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;
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4515
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +6
-0@@ -4507,6 +4507,18 @@ 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_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap) +{ +if (link_coding_cap ==DP_CAP_ANSI_128B132B ) { + mst_state->total_avail_slots =64 ; + mst_state->start_slot =0 ; + }
The values never change AFAICT, should we store the channel encoding instead, and use that information to initialize the values?
(Alternatively, why aren't the 8b/10b values initialized here if 128b/132b are?)
Quoted 40 lines
drivers/gpu/drm/drm_dp_mst_topology.c +9
-3+ +DRM_DEBUG_KMS ("%s coding format on mgr 0x%p\n" , + (link_coding_cap ==DP_CAP_ANSI_128B132B ) ?"128b/132b" :"8b/10b" , mst_state->mgr); +} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/** * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel * @mgr: manager for this port @@ -4538,8 +4550,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; }@@ -5226,7 +5238,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) {drivers/gpu/drm/drm_dp_mst_topology.c +1
-1/* Releasing VCPI is always OK-even if the port is gone */ @@ -5255,7 +5267,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 ; }
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_atomic_check(struct drm_atomic_state *state) · line 5439
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state)break ;mutex_lock (&mgr->lock); + + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +
It feels wrong to me to be copying stuff from mst_state to mgr in general, and in atomic check hook in particular.
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0ret =drm_dp_mst_atomic_check_mstb_bw_limit (mgr->mst_primary, mst_state);mutex_unlock (&mgr->lock);@@ -5527,11 +5543,16 @@ 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);
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, · line 5555
Quoted 10 lines
drivers/gpu/drm/drm_dp_mst_topology.c +5
-0+ mgr->total_avail_slots =63 ; + mgr->start_slot =1 ; mst_state =kzalloc (sizeof (*mst_state),GFP_KERNEL );if (mst_state ==NULL )return -ENOMEM ; + mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; +
The magic values for 8b/10b are now duplicated to two places, with the 128b/132b values in a separate place.
BR,
Jani.
Quoted 41 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0mst_state->mgr = mgr;INIT_LIST_HEAD (&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +13
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state {struct drm_private_state base;struct list_head vcpis;struct drm_dp_mst_topology_mgr *mgr; +u8 total_avail_slots; +u8 start_slot; };#define to_dp_mst_topology_mgr (x) container_of(x, struct drm_dp_mst_topology_mgr, base)@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; +/** +* @total_avail_slots: 63 for 8b/10b, 64 for 128/132b +*/ +u8 total_avail_slots; + +/** +* @start_slot: 1 for 8b/10b, 0 for 128/132b +*/ +u8 start_slot; +/** * @funcs: Atomic helper callbacks */ @@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dpvoid drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_update_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap);void drm_dp_mst_deallocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
Quoted 59 lines · Jani Nikula
Quoted 58 lines · Bhawanpreet Lakha
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.
v2:
* Removeget_mst_link_encoding_cap
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkSigned-off-by Fangzhi Zuo <[email protected]>Signed-off-by Bhawanpreet Lakha <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++ 3 files changed, 69 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-0@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )struct dsc_mst_fairness_vars vars[MAX_PIPES ];#endif +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_mst_topology_mgr *mgr;trace_amdgpu_dm_atomic_check_begin (state);@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; } +#if defined(CONFIG_DRM_AMD_DC_DCN ) +for_each_new_mst_mgr_in_state (state, mgr, mst_state, i) { +struct amdgpu_dm_connector *aconnector; +struct drm_connector *connector; +struct drm_connector_list_iter iter; +u8 link_coding_cap; + +if (!mgr->mst_state ) +continue ; + +drm_connector_list_iter_begin (dev, &iter); +drm_for_each_connector_iter (connector, &iter) { +int id = connector->index; + +if (id == mst_state->mgr->conn_base_id) { + aconnector =to_amdgpu_dm_connector (connector); + link_coding_cap =dc_link_dp_mst_decide_link_encoding_format (aconnector->dc_link); +drm_dp_mst_update_coding_cap (mst_state, link_coding_cap); + +break ;
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device *dev, · line 10849
Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-0+ } + } +drm_connector_list_iter_end (&iter); + + } +#endif I wonder if we could split this to separate drm dp helper and amd driver patches?
I believe that was the original structure but, lyude recommended to put them into the same patch to see how it is being used
Quoted 47 lines
Quoted 35 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0/** * Streams and planes are reset when there are changes that affect * bandwidth. Anything that affects bandwidth needs to go through drivers/gpu/drm/drm_dp_mst_topology.c +3
-3@@ -3368,7 +3368,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);@@ -4321,7 +4321,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; }@@ -4333,7 +4333,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;drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4515
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +6
-0@@ -4507,6 +4507,18 @@ 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_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap) +{ +if (link_coding_cap ==DP_CAP_ANSI_128B132B ) { + mst_state->total_avail_slots =64 ; + mst_state->start_slot =0 ; + }The values never change AFAICT, should we store the channel encoding instead, and use that information to initialize the values?
Quoted 2 lines
(Alternatively, why aren't the 8b/10b values initialized here if 128b/132b are?)
I agree, 8b/10 are the default, but in case where we switch from 128b/132 -> 8b/10b we should be updating them here aswell.
Quoted 41 lines
Quoted 41 lines
drivers/gpu/drm/drm_dp_mst_topology.c +10
-4+ +DRM_DEBUG_KMS ("%s coding format on mgr 0x%p\n" , + (link_coding_cap ==DP_CAP_ANSI_128B132B ) ?"128b/132b" :"8b/10b" , mst_state->mgr); +} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/** * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel * @mgr: manager for this port @@ -4538,8 +4550,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; }@@ -5226,7 +5238,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 */ @@ -5255,7 +5267,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 ; }@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state)break ;
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_atomic_check(struct drm_atomic_state *state) · line 5439
Quoted 5 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0mutex_lock (&mgr->lock); + + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +It feels wrong to me to be copying stuff from
mst_stateto mgr in general, and in atomic check hook in particular.
previously we were setting it directly in the mgr, and this was suggested by lyude. I am not sure what the alternative is.
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/drm_dp_mst_topology.c +2
-0ret =drm_dp_mst_atomic_check_mstb_bw_limit (mgr->mst_primary, mst_state);mutex_unlock (&mgr->lock);@@ -5527,11 +5543,16 @@ 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 )return -ENOMEM ;
Quoted 5 lines
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, · line 5555
Quoted 3 lines
drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+ mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; +The magic values for 8b/10b are now duplicated to two places, with the 128b/132b values in a separate place.
8b/10b is the default (to make sure we don't break any existing driver that doesn't use 128b/132b). Are you against setting it as the default here? or do you mean we should use #define for this? the magic numbers are currently being used directly right now (inside drm_dp_find_vcpi_slots, drm_dp_init_vcpi).
Bhawan
Quoted 44 lines
BR,
Jani.Quoted 41 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0mst_state->mgr = mgr;INIT_LIST_HEAD (&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +13
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state {struct drm_private_state base;struct list_head vcpis;struct drm_dp_mst_topology_mgr *mgr; +u8 total_avail_slots; +u8 start_slot; };#define to_dp_mst_topology_mgr (x) container_of(x, struct drm_dp_mst_topology_mgr, base)@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; +/** +* @total_avail_slots: 63 for 8b/10b, 64 for 128/132b +*/ +u8 total_avail_slots; + +/** +* @start_slot: 1 for 8b/10b, 0 for 128/132b +*/ +u8 start_slot; +/** * @funcs: Atomic helper callbacks */ @@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dpvoid drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_update_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap);void drm_dp_mst_deallocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);
Lyude Paul
maintainerRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
Quoted 3 lines · Bhawanpreet Lakha
Quoted 3 lines
I wonder if we could split this to separate drm dp helper and amd driver patches?
Whoops! I thought it was strange that I would say this but it seems there was a misunderstanding on my part: when the original patch series was submitted I was only CC'd on the first patch and I guess I must not have noticed the 1/2 in the subject line, so I thought Jerry had submitted just a single patch for the helper. Looking back in my email history though that definitely wasn't correct, and the original patch structure was what we wanted to go with.
Sorry for the confusion on my part!
Quoted 204 lines
Quoted 1 line
I believe that was the original structure but, lyude recommended to put them into the same patch to see how it is being used
Quoted 55 lines
Quoted 44 lines
/**
* Streams and planes are reset when there are changes that affect
* bandwidth. Anything that affects bandwidth needs to go throughdrivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -3368,7 +3368,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);drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4321,7 +4321,7 @@ int drm_dp_find_vcpi_slots(structdrm_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;
returnnum_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4333,7 +4333,7 @@ static int drm_dp_init_vcpi(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4507,6 +4507,18 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);Quoted 8 lines
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap)
+{
+ if (link_coding_cap==DP_CAP_ANSI_128B132B) {
+ mst_state->total_avail_slots = 64;
+ mst_state->start_slot = 0;
+ }The values never change AFAICT, should we store the channel encoding instead, and use that information to initialize the values?
Quoted 2 lines
(Alternatively, why aren't the 8b/10b values initialized here if 128b/132b are?)
I agree, 8b/10 are the default, but in case where we switch from 128b/132 -> 8b/10b we should be updating them here aswell.
Quoted 46 lines
Quoted 46 lines
+
+ DRM_DEBUG_KMS("%s coding format on mgr 0x%p\n", + (link_coding_cap ==DP_CAP_ANSI_128B132B) ? "128b/132b":"8b/10b",mst_state->mgr);drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4538,8 +4550,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-Quoted 1 line
total_avail_slots, ret);drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5226,7 +5238,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(struct drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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 */drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5255,7 +5267,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-Quoted 1 line
total_avail_slots-avail_slots);Quoted 14 lines
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_atomic_check(struct drm_atomic_state *state) · line 5439
Quoted 12 lines
return 0;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state) break;
mutex_lock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +4
-0+ + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +It feels wrong to me to be copying stuff from
mst_stateto mgr in general, and in atomic check hook in particular.previously we were setting it directly in the mgr, and this was suggested by lyude. I am not sure what the alternative is.
Quoted 13 lines
Quoted 13 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +2
-0@@ -5527,11 +5543,16 @@ 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);Quoted 8 lines
Quoted 6 lines
if (
mst_state== NULL)
return-ENOMEM;
+ mst_state->total_avail_slots = 63;
+ mst_state->start_slot = 1;
+The magic values for 8b/10b are now duplicated to two places, with the 128b/132b values in a separate place.
8b/10b is the default (to make sure we don't break any existing driver that doesn't use 128b/132b). Are you against setting it as the default here? or do you mean we should use #define for this? the magic numbers are currently being used directly right now (inside
drm_dp_find_vcpi_slots,drm_dp_init_vcpi).Bhawan
Quoted 49 lines
BR,
Jani.Quoted 46 lines
mst_state->mgr = mgr;
INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; };
#defineto_dp_mst_topology_mgr(x)container_of(x, struct drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +0
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;
+ /**
+ * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */
+ u8total_avail_slots;include/drm/drm_dp_mst_helper.h +6
-0+ + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; +/**
* @funcs: Atomic helper callbacks
*/include/drm/drm_dp_mst_helper.h +0
-0@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dp
voiddrm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);
voiddrm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
kernel test robot
build botRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Bhawanpreet LakhaThank you for the patch! Yet something to improve:
Hi Bhawanpreet,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip linus/master v5.15-rc5 next-20211013] [cannot apply to drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next airlied/drm-next] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Bhawanpreet-Lakha/drm-Update-MST-First-Link-Slot-Information-Based-on-Encoding-Format/20211013-060001 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-randconfig-a003-20211012 (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/5604bf980dcbfdd7650b7e1d5d4a2fd9f18cd866 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Bhawanpreet-Lakha/drm-Update-MST-First-Link-Slot-Information-Based-on-Encoding-Format/20211013-060001 git checkout 5604bf980dcbfdd7650b7e1d5d4a2fd9f18cd866 # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/amd/amdgpu/../display/dmub/dmub_srv.h:67,
from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:35:
drivers/gpu/drm/amd/amdgpu/../display/dmub/inc/dmub_cmd.h: In function 'dmub_rb_flush_pending':
drivers/gpu/drm/amd/amdgpu/../display/dmub/inc/dmub_cmd.h:2819:12: warning: variable 'temp' set but not used [-Wunused-but-set-variable]
2819 | uint64_t temp;
| ^~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: At top level:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:633:6: warning: no previous prototype for 'dmub_aux_setconfig_callback' [-Wmissing-prototypes]
633 | void dmub_aux_setconfig_callback(struct amdgpu_device *adev, struct dmub_notification *notify)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:649:6: warning: no previous prototype for 'dmub_hpd_callback' [-Wmissing-prototypes]
649 | void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *notify)
| ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:706:6: warning: no previous prototype for 'register_dmub_notify_callback' [-Wmissing-prototypes]
706 | bool register_dmub_notify_callback(struct amdgpu_device *adev, enum dmub_notification_type type,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'dm_update_mst_vcpi_slots_for_dsc':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7174:12: warning: variable 'clock' set but not used [-Wunused-but-set-variable]
7174 | int i, j, clock;
| ^~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_check':
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:10912:23: error: implicit declaration of function 'dc_link_dp_mst_decide_link_encoding_format' [-Werror=implicit-function-declaration]
10912 | link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: At top level:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:11394:5: warning: no previous prototype for 'amdgpu_dm_set_dmub_async_sync_status' [-Wmissing-prototypes]
11394 | int amdgpu_dm_set_dmub_async_sync_status(bool is_cmd_aux, struct dc_context *ctx,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
vim +/dc_link_dp_mst_decide_link_encoding_format +10912 drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c
10643
10644 /**
10645 * amdgpu_dm_atomic_check() - Atomic check implementation for AMDgpu DM.
10646 * @dev: The DRM device
10647 * @state: The atomic state to commit
10648 *
10649 * Validate that the given atomic state is programmable by DC into hardware.
10650 * This involves constructing a &struct dc_state reflecting the new hardware
10651 * state we wish to commit, then querying DC to see if it is programmable. It's
10652 * important not to modify the existing DC state. Otherwise, atomic_check
10653 * may unexpectedly commit hardware changes.
10654 *
10655 * When validating the DC state, it's important that the right locks are
10656 * acquired. For full updates case which removes/adds/updates streams on one
10657 * CRTC while flipping on another CRTC, acquiring global lock will guarantee
10658 * that any such full update commit will wait for completion of any outstanding
10659 * flip using DRMs synchronization events.
10660 *
10661 * Note that DM adds the affected connectors for all CRTCs in state, when that
10662 * might not seem necessary. This is because DC stream creation requires the
10663 * DC sink, which is tied to the DRM connector state. Cleaning this up should
10664 * be possible but non-trivial - a possible TODO item.
10665 *
10666 * Return: -Error code if validation failed.
10667 */
10668 static int amdgpu_dm_atomic_check(struct drm_device *dev,
10669 struct drm_atomic_state *state)
10670 {
10671 struct amdgpu_device *adev = drm_to_adev(dev);
10672 struct dm_atomic_state *dm_state = NULL;
10673 struct dc *dc = adev->dm.dc;
10674 struct drm_connector *connector;
10675 struct drm_connector_state *old_con_state, *new_con_state;
10676 struct drm_crtc *crtc;
10677 struct drm_crtc_state *old_crtc_state, *new_crtc_state;
10678 struct drm_plane *plane;
10679 struct drm_plane_state *old_plane_state, *new_plane_state;
10680 enum dc_status status;
10681 int ret, i;
10682 bool lock_and_validation_needed = false;
10683 struct dm_crtc_state *dm_old_crtc_state;
10684 #if defined(CONFIG_DRM_AMD_DC_DCN)
10685 struct dsc_mst_fairness_vars vars[MAX_PIPES];
10686 #endif
10687 struct drm_dp_mst_topology_state *mst_state;
10688 struct drm_dp_mst_topology_mgr *mgr;
10689
10690 trace_amdgpu_dm_atomic_check_begin(state);
10691
10692 ret = drm_atomic_helper_check_modeset(dev, state);
10693 if (ret)
10694 goto fail;
10695
10696 /* Check connector changes */
10697 for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
10698 struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
10699 struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
10700
10701 /* Skip connectors that are disabled or part of modeset already. */
10702 if (!old_con_state->crtc && !new_con_state->crtc)
10703 continue;
10704
10705 if (!new_con_state->crtc)
10706 continue;
10707
10708 new_crtc_state = drm_atomic_get_crtc_state(state, new_con_state->crtc);
10709 if (IS_ERR(new_crtc_state)) {
10710 ret = PTR_ERR(new_crtc_state);
10711 goto fail;
10712 }
10713
10714 if (dm_old_con_state->abm_level !=
10715 dm_new_con_state->abm_level)
10716 new_crtc_state->connectors_changed = true;
10717 }
10718
10719 #if defined(CONFIG_DRM_AMD_DC_DCN)
10720 if (dc_resource_is_dsc_encoding_supported(dc)) {
10721 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10722 if (drm_atomic_crtc_needs_modeset(new_crtc_state)) {
10723 ret = add_affected_mst_dsc_crtcs(state, crtc);
10724 if (ret)
10725 goto fail;
10726 }
10727 }
10728 }
10729 #endif
10730 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10731 dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
10732
10733 if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
10734 !new_crtc_state->color_mgmt_changed &&
10735 old_crtc_state->vrr_enabled == new_crtc_state->vrr_enabled &&
10736 dm_old_crtc_state->dsc_force_changed == false)
10737 continue;
10738
10739 ret = amdgpu_dm_verify_lut_sizes(new_crtc_state);
10740 if (ret)
10741 goto fail;
10742
10743 if (!new_crtc_state->enable)
10744 continue;
10745
10746 ret = drm_atomic_add_affected_connectors(state, crtc);
10747 if (ret)
10748 return ret;
10749
10750 ret = drm_atomic_add_affected_planes(state, crtc);
10751 if (ret)
10752 goto fail;
10753
10754 if (dm_old_crtc_state->dsc_force_changed)
10755 new_crtc_state->mode_changed = true;
10756 }
10757
10758 /*
10759 * Add all primary and overlay planes on the CRTC to the state
10760 * whenever a plane is enabled to maintain correct z-ordering
10761 * and to enable fast surface updates.
10762 */
10763 drm_for_each_crtc(crtc, dev) {
10764 bool modified = false;
10765
10766 for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
10767 if (plane->type == DRM_PLANE_TYPE_CURSOR)
10768 continue;
10769
10770 if (new_plane_state->crtc == crtc ||
10771 old_plane_state->crtc == crtc) {
10772 modified = true;
10773 break;
10774 }
10775 }
10776
10777 if (!modified)
10778 continue;
10779
10780 drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) {
10781 if (plane->type == DRM_PLANE_TYPE_CURSOR)
10782 continue;
10783
10784 new_plane_state =
10785 drm_atomic_get_plane_state(state, plane);
10786
10787 if (IS_ERR(new_plane_state)) {
10788 ret = PTR_ERR(new_plane_state);
10789 goto fail;
10790 }
10791 }
10792 }
10793
10794 /* Remove exiting planes if they are modified */
10795 for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
10796 ret = dm_update_plane_state(dc, state, plane,
10797 old_plane_state,
10798 new_plane_state,
10799 false,
10800 &lock_and_validation_needed);
10801 if (ret)
10802 goto fail;
10803 }
10804
10805 /* Disable all crtcs which require disable */
10806 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10807 ret = dm_update_crtc_state(&adev->dm, state, crtc,
10808 old_crtc_state,
10809 new_crtc_state,
10810 false,
10811 &lock_and_validation_needed);
10812 if (ret)
10813 goto fail;
10814 }
10815
10816 /* Enable all crtcs which require enable */
10817 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10818 ret = dm_update_crtc_state(&adev->dm, state, crtc,
10819 old_crtc_state,
10820 new_crtc_state,
10821 true,
10822 &lock_and_validation_needed);
10823 if (ret)
10824 goto fail;
10825 }
10826
10827 ret = validate_overlay(state);
10828 if (ret)
10829 goto fail;
10830
10831 /* Add new/modified planes */
10832 for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
10833 ret = dm_update_plane_state(dc, state, plane,
10834 old_plane_state,
10835 new_plane_state,
10836 true,
10837 &lock_and_validation_needed); 10838 if (ret)
10839 goto fail;
10840 }
10841
10842 /* Run this here since we want to validate the streams we created */
10843 ret = drm_atomic_helper_check_planes(dev, state);
10844 if (ret)
10845 goto fail;
10846
10847 /* Check cursor planes scaling */
10848 for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
10849 ret = dm_check_crtc_cursor(state, crtc, new_crtc_state);
10850 if (ret)
10851 goto fail;
10852 }
10853
10854 if (state->legacy_cursor_update) {
10855 /*
10856 * This is a fast cursor update coming from the plane update
10857 * helper, check if it can be done asynchronously for better
10858 * performance.
10859 */
10860 state->async_update =
10861 !drm_atomic_helper_async_check(dev, state);
10862
10863 /*
10864 * Skip the remaining global validation if this is an async
10865 * update. Cursor updates can be done without affecting
10866 * state or bandwidth calcs and this avoids the performance
10867 * penalty of locking the private state object and
10868 * allocating a new dc_state.
10869 */
10870 if (state->async_update)
10871 return 0;
10872 }
10873
10874 /* Check scaling and underscan changes*/
10875 /* TODO Removed scaling changes validation due to inability to commit
10876 * new stream into context w\o causing full reset. Need to
10877 * decide how to handle.
10878 */
10879 for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
10880 struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
10881 struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
10882 struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);
10883
10884 /* Skip any modesets/resets */
10885 if (!acrtc || drm_atomic_crtc_needs_modeset(
10886 drm_atomic_get_new_crtc_state(state, &acrtc->base)))
10887 continue;
10888
10889 /* Skip any thing not scale or underscan changes */
10890 if (!is_scaling_state_different(dm_new_con_state, dm_old_con_state))
10891 continue;
10892
10893 lock_and_validation_needed = true;
10894 }
10895
10896 #if defined(CONFIG_DRM_AMD_DC_DCN)
10897 for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) {
10898 struct amdgpu_dm_connector *aconnector;
10899 struct drm_connector *connector;
10900 struct drm_connector_list_iter iter;
10901 u8 link_coding_cap;
10902
10903 if (!mgr->mst_state )
10904 continue;
10905
10906 drm_connector_list_iter_begin(dev, &iter);
10907 drm_for_each_connector_iter(connector, &iter) {
10908 int id = connector->index;
10909
10910 if (id == mst_state->mgr->conn_base_id) {
10911 aconnector = to_amdgpu_dm_connector(connector);
10912 link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link);
10913 drm_dp_mst_update_coding_cap(mst_state, link_coding_cap);
10914
10915 break;
10916 }
10917 }
10918 drm_connector_list_iter_end(&iter);
10919
10920 }
10921 #endif
10922 /**
10923 * Streams and planes are reset when there are changes that affect
10924 * bandwidth. Anything that affects bandwidth needs to go through
10925 * DC global validation to ensure that the configuration can be applied
10926 * to hardware.
10927 *
10928 * We have to currently stall out here in atomic_check for outstanding
10929 * commits to finish in this case because our IRQ handlers reference
10930 * DRM state directly - we can end up disabling interrupts too early
10931 * if we don't.
10932 *
10933 * TODO: Remove this stall and drop DM state private objects.
10934 */
10935 if (lock_and_validation_needed) {
10936 ret = dm_atomic_get_state(state, &dm_state);
10937 if (ret)
10938 goto fail;
10939
10940 ret = do_aquire_global_lock(dev, state);
10941 if (ret)
10942 goto fail;
10943
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Bhawanpreet LakhaThank you for the patch! Yet something to improve:
Hi Bhawanpreet,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip linus/master v5.15-rc5 next-20211013] [cannot apply to drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next airlied/drm-next] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Bhawanpreet-Lakha/drm-Update-MST-First-Link-Slot-Information-Based-on-Encoding-Format/20211013-060001 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-a005-20211013 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project b6a8c695542b2987eb9a203d5663a0740cb4725f)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/5604bf980dcbfdd7650b7e1d5d4a2fd9f18cd866
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Bhawanpreet-Lakha/drm-Update-MST-First-Link-Slot-Information-Based-on-Encoding-Format/20211013-060001 git checkout 5604bf980dcbfdd7650b7e1d5d4a2fd9f18cd866
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:35:
In file included from drivers/gpu/drm/amd/amdgpu/../display/dmub/dmub_srv.h:67:
drivers/gpu/drm/amd/amdgpu/../display/dmub/inc/dmub_cmd.h:2819:12: warning: variable 'temp' set but not used [-Wunused-but-set-variable]
uint64_t temp;
^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:633:6: warning: no previous prototype for function 'dmub_aux_setconfig_callback' [-Wmissing-prototypes]
void dmub_aux_setconfig_callback(struct amdgpu_device *adev, struct dmub_notification *notify)
^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:633:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
void dmub_aux_setconfig_callback(struct amdgpu_device *adev, struct dmub_notification *notify)
^
static
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:649:6: warning: no previous prototype for function 'dmub_hpd_callback' [-Wmissing-prototypes]
void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *notify)
^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:649:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *notify)
^
static
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:706:6: warning: no previous prototype for function 'register_dmub_notify_callback' [-Wmissing-prototypes]
bool register_dmub_notify_callback(struct amdgpu_device *adev, enum dmub_notification_type type,
^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:706:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
bool register_dmub_notify_callback(struct amdgpu_device *adev, enum dmub_notification_type type,
^
static
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7174:12: warning: variable 'clock' set but not used [-Wunused-but-set-variable]
int i, j, clock;
^
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:10912:23: error: implicit declaration of function 'dc_link_dp_mst_decide_link_encoding_format' [-Werror,-Wimplicit-function-declaration]
link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link);
^
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:11394:5: warning: no previous prototype for function 'amdgpu_dm_set_dmub_async_sync_status' [-Wmissing-prototypes]
int amdgpu_dm_set_dmub_async_sync_status(bool is_cmd_aux, struct dc_context *ctx,
^ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:11394:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int amdgpu_dm_set_dmub_async_sync_status(bool is_cmd_aux, struct dc_context *ctx,
^
static
6 warnings and 1 error generated.
vim +/dc_link_dp_mst_decide_link_encoding_format +10912 drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c
10643
10644 /**
10645 * amdgpu_dm_atomic_check() - Atomic check implementation for AMDgpu DM.
10646 * @dev: The DRM device
10647 * @state: The atomic state to commit
10648 *
10649 * Validate that the given atomic state is programmable by DC into hardware.
10650 * This involves constructing a &struct dc_state reflecting the new hardware
10651 * state we wish to commit, then querying DC to see if it is programmable. It's
10652 * important not to modify the existing DC state. Otherwise, atomic_check
10653 * may unexpectedly commit hardware changes.
10654 *
10655 * When validating the DC state, it's important that the right locks are
10656 * acquired. For full updates case which removes/adds/updates streams on one
10657 * CRTC while flipping on another CRTC, acquiring global lock will guarantee
10658 * that any such full update commit will wait for completion of any outstanding
10659 * flip using DRMs synchronization events.
10660 *
10661 * Note that DM adds the affected connectors for all CRTCs in state, when that
10662 * might not seem necessary. This is because DC stream creation requires the
10663 * DC sink, which is tied to the DRM connector state. Cleaning this up should
10664 * be possible but non-trivial - a possible TODO item.
10665 *
10666 * Return: -Error code if validation failed.
10667 */
10668 static int amdgpu_dm_atomic_check(struct drm_device *dev,
10669 struct drm_atomic_state *state)
10670 {
10671 struct amdgpu_device *adev = drm_to_adev(dev);
10672 struct dm_atomic_state *dm_state = NULL;
10673 struct dc *dc = adev->dm.dc;
10674 struct drm_connector *connector;
10675 struct drm_connector_state *old_con_state, *new_con_state;
10676 struct drm_crtc *crtc;
10677 struct drm_crtc_state *old_crtc_state, *new_crtc_state;
10678 struct drm_plane *plane;
10679 struct drm_plane_state *old_plane_state, *new_plane_state;
10680 enum dc_status status;
10681 int ret, i;
10682 bool lock_and_validation_needed = false;
10683 struct dm_crtc_state *dm_old_crtc_state;
10684 #if defined(CONFIG_DRM_AMD_DC_DCN)
10685 struct dsc_mst_fairness_vars vars[MAX_PIPES];
10686 #endif
10687 struct drm_dp_mst_topology_state *mst_state;
10688 struct drm_dp_mst_topology_mgr *mgr;
10689
10690 trace_amdgpu_dm_atomic_check_begin(state);
10691
10692 ret = drm_atomic_helper_check_modeset(dev, state);
10693 if (ret)
10694 goto fail;
10695
10696 /* Check connector changes */
10697 for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
10698 struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
10699 struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
10700
10701 /* Skip connectors that are disabled or part of modeset already. */
10702 if (!old_con_state->crtc && !new_con_state->crtc)
10703 continue;
10704
10705 if (!new_con_state->crtc)
10706 continue;
10707
10708 new_crtc_state = drm_atomic_get_crtc_state(state, new_con_state->crtc);
10709 if (IS_ERR(new_crtc_state)) {
10710 ret = PTR_ERR(new_crtc_state);
10711 goto fail;
10712 }
10713
10714 if (dm_old_con_state->abm_level !=
10715 dm_new_con_state->abm_level)
10716 new_crtc_state->connectors_changed = true;
10717 }
10718
10719 #if defined(CONFIG_DRM_AMD_DC_DCN)
10720 if (dc_resource_is_dsc_encoding_supported(dc)) {
10721 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10722 if (drm_atomic_crtc_needs_modeset(new_crtc_state)) {
10723 ret = add_affected_mst_dsc_crtcs(state, crtc);
10724 if (ret)
10725 goto fail;
10726 }
10727 }
10728 }
10729 #endif
10730 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10731 dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
10732
10733 if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
10734 !new_crtc_state->color_mgmt_changed &&
10735 old_crtc_state->vrr_enabled == new_crtc_state->vrr_enabled &&
10736 dm_old_crtc_state->dsc_force_changed == false)
10737 continue;
10738
10739 ret = amdgpu_dm_verify_lut_sizes(new_crtc_state);
10740 if (ret)
10741 goto fail;
10742
10743 if (!new_crtc_state->enable)
10744 continue;
10745
10746 ret = drm_atomic_add_affected_connectors(state, crtc);
10747 if (ret)
10748 return ret;
10749
10750 ret = drm_atomic_add_affected_planes(state, crtc);
10751 if (ret)
10752 goto fail;
10753
10754 if (dm_old_crtc_state->dsc_force_changed)
10755 new_crtc_state->mode_changed = true;
10756 }
10757
10758 /*
10759 * Add all primary and overlay planes on the CRTC to the state
10760 * whenever a plane is enabled to maintain correct z-ordering
10761 * and to enable fast surface updates.
10762 */
10763 drm_for_each_crtc(crtc, dev) {
10764 bool modified = false;
10765
10766 for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
10767 if (plane->type == DRM_PLANE_TYPE_CURSOR)
10768 continue;
10769
10770 if (new_plane_state->crtc == crtc ||
10771 old_plane_state->crtc == crtc) {
10772 modified = true;
10773 break;
10774 }
10775 }
10776
10777 if (!modified)
10778 continue;
10779
10780 drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) {
10781 if (plane->type == DRM_PLANE_TYPE_CURSOR)
10782 continue;
10783
10784 new_plane_state =
10785 drm_atomic_get_plane_state(state, plane);
10786
10787 if (IS_ERR(new_plane_state)) {
10788 ret = PTR_ERR(new_plane_state);
10789 goto fail;
10790 }
10791 }
10792 }
10793
10794 /* Remove exiting planes if they are modified */
10795 for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
10796 ret = dm_update_plane_state(dc, state, plane,
10797 old_plane_state,
10798 new_plane_state,
10799 false,
10800 &lock_and_validation_needed);
10801 if (ret)
10802 goto fail;
10803 }
10804
10805 /* Disable all crtcs which require disable */
10806 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10807 ret = dm_update_crtc_state(&adev->dm, state, crtc,
10808 old_crtc_state,
10809 new_crtc_state,
10810 false,
10811 &lock_and_validation_needed);
10812 if (ret)
10813 goto fail;
10814 }
10815
10816 /* Enable all crtcs which require enable */
10817 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
10818 ret = dm_update_crtc_state(&adev->dm, state, crtc,
10819 old_crtc_state,
10820 new_crtc_state,
10821 true,
10822 &lock_and_validation_needed);
10823 if (ret)
10824 goto fail;
10825 }
10826
10827 ret = validate_overlay(state);
10828 if (ret)
10829 goto fail;
10830
10831 /* Add new/modified planes */
10832 for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
10833 ret = dm_update_plane_state(dc, state, plane,
10834 old_plane_state,
10835 new_plane_state,
10836 true,
10837 &lock_and_validation_needed); 10838 if (ret)
10839 goto fail;
10840 }
10841
10842 /* Run this here since we want to validate the streams we created */
10843 ret = drm_atomic_helper_check_planes(dev, state);
10844 if (ret)
10845 goto fail;
10846
10847 /* Check cursor planes scaling */
10848 for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
10849 ret = dm_check_crtc_cursor(state, crtc, new_crtc_state);
10850 if (ret)
10851 goto fail;
10852 }
10853
10854 if (state->legacy_cursor_update) {
10855 /*
10856 * This is a fast cursor update coming from the plane update
10857 * helper, check if it can be done asynchronously for better
10858 * performance.
10859 */
10860 state->async_update =
10861 !drm_atomic_helper_async_check(dev, state);
10862
10863 /*
10864 * Skip the remaining global validation if this is an async
10865 * update. Cursor updates can be done without affecting
10866 * state or bandwidth calcs and this avoids the performance
10867 * penalty of locking the private state object and
10868 * allocating a new dc_state.
10869 */
10870 if (state->async_update)
10871 return 0;
10872 }
10873
10874 /* Check scaling and underscan changes*/
10875 /* TODO Removed scaling changes validation due to inability to commit
10876 * new stream into context w\o causing full reset. Need to
10877 * decide how to handle.
10878 */
10879 for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
10880 struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
10881 struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
10882 struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);
10883
10884 /* Skip any modesets/resets */
10885 if (!acrtc || drm_atomic_crtc_needs_modeset(
10886 drm_atomic_get_new_crtc_state(state, &acrtc->base)))
10887 continue;
10888
10889 /* Skip any thing not scale or underscan changes */
10890 if (!is_scaling_state_different(dm_new_con_state, dm_old_con_state))
10891 continue;
10892
10893 lock_and_validation_needed = true;
10894 }
10895
10896 #if defined(CONFIG_DRM_AMD_DC_DCN)
10897 for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) {
10898 struct amdgpu_dm_connector *aconnector;
10899 struct drm_connector *connector;
10900 struct drm_connector_list_iter iter;
10901 u8 link_coding_cap;
10902
10903 if (!mgr->mst_state )
10904 continue;
10905
10906 drm_connector_list_iter_begin(dev, &iter);
10907 drm_for_each_connector_iter(connector, &iter) {
10908 int id = connector->index;
10909
10910 if (id == mst_state->mgr->conn_base_id) {
10911 aconnector = to_amdgpu_dm_connector(connector);
10912 link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link);
10913 drm_dp_mst_update_coding_cap(mst_state, link_coding_cap);
10914
10915 break;
10916 }
10917 }
10918 drm_connector_list_iter_end(&iter);
10919
10920 }
10921 #endif
10922 /**
10923 * Streams and planes are reset when there are changes that affect
10924 * bandwidth. Anything that affects bandwidth needs to go through
10925 * DC global validation to ensure that the configuration can be applied
10926 * to hardware.
10927 *
10928 * We have to currently stall out here in atomic_check for outstanding
10929 * commits to finish in this case because our IRQ handlers reference
10930 * DRM state directly - we can end up disabling interrupts too early
10931 * if we don't.
10932 *
10933 * TODO: Remove this stall and drop DM state private objects.
10934 */
10935 if (lock_and_validation_needed) {
10936 ret = dm_atomic_get_state(state, &dm_state);
10937 if (ret)
10938 goto fail;
10939
10940 ret = do_aquire_global_lock(dev, state);
10941 if (ret)
10942 goto fail;
10943
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Lyude Paul
maintainerRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Bhawanpreet LakhaSome comments below (also, sorry again for the mixup on the last review!)
Quoted 41 lines · Bhawanpreet Lakha
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.
v2:
* Removeget_mst_link_encoding_cap
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkSigned-off-by Fangzhi Zuo <[email protected]>Signed-off-by Bhawanpreet Lakha <[email protected]>---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++3 files changed, 69 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, #if defined(CONFIG_DRM_AMD_DC_DCN) struct dsc_mst_fairness_vars vars[MAX_PIPES]; #endif + struct drm_dp_mst_topology_state *mst_state; + struct drm_dp_mst_topology_mgr *mgr;
trace_amdgpu_dm_atomic_check_begin(state);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device *dev, · line 10832
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9
-0+#if defined(CONFIG_DRM_AMD_DC_DCN ) + for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) { + struct amdgpu_dm_connector *aconnector; + struct drm_connector *connector; + struct drm_connector_list_iter iter; + u8 link_coding_cap; + + if (!mgr->mst_state ) + continue;
extraneous space
Quoted 41 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-0+ + drm_connector_list_iter_begin(dev, &iter); + drm_for_each_connector_iter(connector, &iter) { + int id = connector->index; + + if (id == mst_state->mgr->conn_base_id) { + aconnector =
to_amdgpu_dm_connector(connector);
+ link_coding_cap =dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link); + drm_dp_mst_update_coding_cap(mst_state,link_coding_cap);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-0+ + break; + } + } + drm_connector_list_iter_end(&iter); + + } +#endif /**
* Streams and planes are reset when there are changes that affect
* bandwidth. Anything that affects bandwidth needs to go throughdrivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -3368,7 +3368,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);drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4321,7 +4321,7 @@ int drm_dp_find_vcpi_slots(structdrm_dp_mst_topology_mgr *mgr, num_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
Quoted 5 lines
/* max. time slots - one slot for MTP header */ - if (num_slots> 63)
+ if (num_slots>mgr->total_avail_slots) return-ENOSPC;
For reasons I will explain a little further in this email, we might want to drop this…
Quoted 9 lines
return
num_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4333,7 +4333,7 @@ static int drm_dp_init_vcpi(structdrm_dp_mst_topology_mgr *mgr, int ret;
/* max. time slots - one slot for MTP header */ - if (slots > 63)
+ if (slots >mgr->total_avail_slots)
…and this
Quoted 10 lines
return
-ENOSPC;
vcpi->pbn = pbn;drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4507,6 +4507,18 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap)
Need some kdocs here
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+{ + if (link_coding_cap == DP_CAP_ANSI_128B132B) { + mst_state->total_avail_slots = 64; + mst_state->start_slot = 0; + } + + DRM_DEBUG_KMS("%s coding format on mgr 0x%p\n", + (link_coding_cap == DP_CAP_ANSI_128B132B) ?"128b/132b":"8b/10b",
mst_state->mgr);
need to fix indenting here, and wrap this to 100 chars
Quoted 49 lines
drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -4538,8 +4550,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-Quoted 1 line
total_avail_slots, ret);drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5226,7 +5238,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(struct drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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 */drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5255,7 +5267,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;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state) break;
mutex_lock(&mgr->lock);
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_atomic_check(struct drm_atomic_state *state) · line 5439
Quoted 4 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0+ + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +
this isn't correct - atomic checks aren't allowed to mutate anything besides the atomic state structure that we're checking since we don't know whether or not the display state is going to be committed when checking it. If we're storing state in mgr, that state needs to be written to mgr during the atomic commit instead of the atomic check.
...but, coming back to this MST code after being gone for a while, I think it might be time for us to stop worrying about the non-atomic state. Especially since there's only one driver using it; the legacy radeon.ko; and right now the plan is either to just drop MST support on radeon.ko or move the MST code it uses into radeon.ko.Which brings me to say - I think we can drop some of the hunks I mentioned above (e.g. the changes to drm_dp_init_vcpi and drm_dp_find_vcpi_slots I mentioned above). We can then just update the kdocs for these functions in a separate patch to clarify that now in addition to being deprecated, these functions are just broken and will eventually be removed.
So - doing that allows us to get rid of mgr->total_avail_slots and mgr-
Quoted 1 line
start_slotentirely, just set the slot info in the atomic state during atomic
check, and then just rely on the atomic state for drm_dp_atomic_find_vcpi_slots() and friends. Which seems much simpler to me, does this sound alrght with you?
Quoted 65 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +2
-0@@ -5527,11 +5543,16 @@ 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)
return-ENOMEM;
+ mst_state->total_avail_slots = 63;
+ mst_state->start_slot = 1;
+
mst_state->mgr = mgr;INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; };
#defineto_dp_mst_topology_mgr(x)container_of(x, struct drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +0
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;
+ /**
+ * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */
+ u8total_avail_slots;include/drm/drm_dp_mst_helper.h +6
-0+ + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; +/**
* @funcs: Atomic helper callbacks
*/include/drm/drm_dp_mst_helper.h +0
-0@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dp
voiddrm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);
voiddrm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Re: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
Quoted 208 lines · Lyude Paul
Some comments below (also, sorry again for the mixup on the last review!)
Quoted 40 lines · Bhawanpreet Lakha
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.
v2:
* Removeget_mst_link_encoding_cap
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkSigned-off-by Fangzhi Zuo <[email protected]>Signed-off-by Bhawanpreet Lakha <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++ 3 files changed, 69 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, #if defined(CONFIG_DRM_AMD_DC_DCN) struct dsc_mst_fairness_vars vars[MAX_PIPES]; #endif + struct drm_dp_mst_topology_state *mst_state; + struct drm_dp_mst_topology_mgr *mgr; trace_amdgpu_dm_atomic_check_begin(state);@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device · line 10833
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9
-0+#if defined(CONFIG_DRM_AMD_DC_DCN ) + for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) { + struct amdgpu_dm_connector *aconnector; + struct drm_connector *connector; + struct drm_connector_list_iter iter; + u8 link_coding_cap; + + if (!mgr->mst_state ) + continue;extraneous space
Quoted 39 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9
-0+ + drm_connector_list_iter_begin(dev, &iter); + drm_for_each_connector_iter(connector, &iter) { + int id = connector->index; + + if (id == mst_state->mgr->conn_base_id) { + aconnector =to_amdgpu_dm_connector (connector); + link_coding_cap =dc_link_dp_mst_decide_link_encoding_format (aconnector->dc_link); + drm_dp_mst_update_coding_cap(mst_state,
link_coding_cap);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-0+ + break; + } + } + drm_connector_list_iter_end(&iter); + + } +#endif /*** Streams and planes are reset when there are changes that affect * bandwidth. Anything that affects bandwidth needs to go through drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -3368,7 +3368,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);
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_find_vcpi_slots(struct · line 4326
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4321,7 +4321,7 @@ int drm_dp_find_vcpi_slots(structdrm_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;For reasons I will explain a little further in this email, we might want to drop this…
drivers/gpu/drm/drm_dp_mst_topology.c static int drm_dp_init_vcpi(struct · line 4337
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0return num_slots;}
drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4333,7 +4333,7 @@ static int drm_dp_init_vcpi(structdrm_dp_mst_topology_mgr *mgr, int ret; /* max. time slots - one slot for MTP header */ - if (slots > 63) + if (slots > mgr->total_avail_slots)…and this
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct · line 4512
Quoted 10 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0return -ENOSPC;vcpi->pbn = pbn;
drivers/gpu/drm/drm_dp_mst_topology.c +1
-0@@ -4507,6 +4507,18 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots); +void drm_dp_mst_update_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap)Need some kdocs here
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+{ + if (link_coding_cap == DP_CAP_ANSI_128B132B) { + mst_state->total_avail_slots = 64; + mst_state->start_slot = 0; + } + + DRM_DEBUG_KMS("%s coding format on mgr 0x%p\n", + (link_coding_cap == DP_CAP_ANSI_128B132B) ? "128b/132b":"8b/10b", mst_state->mgr);need to fix indenting here, and wrap this to 100 chars
Quoted 45 lines
drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +2
-2@@ -4538,8 +4550,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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-Quoted 1 line
total_avail_slots, ret);drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -5226,7 +5238,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 */drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -5255,7 +5267,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(structdrm_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;
}drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_atomic_check(struct drm_atomic_state · line 5440
Quoted 8 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state) break; mutex_lock(&mgr->lock); + + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +this isn't correct - atomic checks aren't allowed to mutate anything besides the atomic state structure that we're checking since we don't know whether or not the display state is going to be committed when checking it. If we're storing state in mgr, that state needs to be written to mgr during the atomic commit instead of the atomic check.
...but, coming back to this MST code after being gone for a while, I think it might be time for us to stop worrying about the non-atomic state. Especially since there's only one driver using it; the legacy radeon.ko; and right now the plan is either to just drop MST support on radeon.ko or move the MST code it uses into radeon.ko.Which brings me to say - I think we can drop some of the hunks I mentioned above (e.g. the changes to
drm_dp_init_vcpianddrm_dp_find_vcpi_slotsI mentioned above). We can then just update the kdocs for these functions in a separate patch to clarify that now in addition to being deprecated, these functions are just broken and will eventually be removed.
Quoted 5 lines
So - doing that allows us to get rid of
mgr->total_avail_slotsand mgr-Quoted 1 line
start_slotentirely, just set the slot info in the atomic state during atomiccheck, and then just rely on the atomic state for
drm_dp_atomic_find_vcpi_slots()and friends. Which seems much simpler to me, does this sound alrght with you?
Thanks for the response,
That function is per port (drm_dp_atomic_find_vcpi_slots) so not sure how that will work, maybe I don't understand what you mean?
Also we only need to check this inside drm_dp_mst_atomic_check_vcpi_alloc_limit(), which doesn't have a state, so we still need to have this on the mgr somehow.
I was thinking we could add the slots(or some DP version indicator) inside the drm_connector, and add a parameter to drm_dp_mst_atomic_check_vcpi_alloc_limit(int slots) and call it with this info via drm_dp_mst_atomic_check().
Bhawan
Quoted 66 lines
Quoted 66 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +5
-0@@ -5527,11 +5543,16 @@ 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) return -ENOMEM; + mst_state->total_avail_slots = 63; + mst_state->start_slot = 1; + mst_state->mgr = mgr; INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; }; #define to_dp_mst_topology_mgr(x) container_of(x, struct
drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +10
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; + /** + * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */ + u8 total_avail_slots; + + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; + /*** @funcs: Atomic helper callbacks */ @@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dpvoid drm_dp_mst_reset_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr,
structdrm_dp_mst_port*port);+void
drm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);void
drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Re: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
Adding Mikita aswell
Quoted 279 lines · Bhawanpreet Lakha
Quoted 202 lines · Lyude Paul
Some comments below (also, sorry again for the mixup on the last review!)
Quoted 41 lines · Bhawanpreet Lakha
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.
v2:
* Removeget_mst_link_encoding_cap
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkSigned-off-by Fangzhi Zuo <[email protected]>Signed-off-by Bhawanpreet Lakha <[email protected]>---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35
+++++++++++++++----
include/drm/drm_dp_mst_helper.h | 13 +++++++3 files changed, 69 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct
drm_device
*dev,
#ifdefined(CONFIG_DRM_AMD_DC_DCN)
structdsc_mst_fairness_varsvars[MAX_PIPES];
#endif
+ structdrm_dp_mst_topology_state*mst_state;
+ structdrm_dp_mst_topology_mgr*mgr;trace_amdgpu_dm_atomic_check_begin(state);
@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(structdrm_device*dev,
lock_and_validation_needed = true;
}
+#ifdefined(CONFIG_DRM_AMD_DC_DCN)Quoted 8 lines
+ for_each_new_mst_mgr_in_state(state, mgr,
mst_state, i) { + structamdgpu_dm_connector*aconnector; + structdrm_connector*connector;
+ structdrm_connector_list_iteriter;
+ u8link_coding_cap;
+
+ if (!mgr->mst_state )
+ continue;extraneous space
Quoted 38 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-0+ + drm_connector_list_iter_begin(dev, &iter); + drm_for_each_connector_iter(connector, &iter) { + int id = connector->index; + + if (id == mst_state->mgr->conn_base_id) { + aconnector =
to_amdgpu_dm_connector(connector);
+ link_coding_cap =dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link); + drm_dp_mst_update_coding_cap(mst_state,link_coding_cap);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-0+ + break; + } + } + drm_connector_list_iter_end(&iter); + + } +#endif /**
* Streams and planes are reset when there are changes that affect
* bandwidth. Anything that affects bandwidth needs to go throughdrivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -3368,7 +3368,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);drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_find_vcpi_slots(struct · line 4325
Quoted 6 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4321,7 +4321,7 @@ int drm_dp_find_vcpi_slots(structdrm_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;For reasons I will explain a little further in this email, we might want to drop this…
drivers/gpu/drm/drm_dp_mst_topology.c static int drm_dp_init_vcpi(struct · line 4336
Quoted 8 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-1return num_slots; }@@ -4333,7 +4333,7 @@ static int drm_dp_init_vcpi(structdrm_dp_mst_topology_mgr *mgr, int ret; /* max. time slots - one slot for MTP header */ - if (slots > 63) + if (slots > mgr->total_avail_slots)…and this
Quoted 8 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0return -ENOSPC; vcpi->pbn = pbn;@@ -4507,6 +4507,18 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots);+void
drm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap)Need some kdocs here
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+{ + if (link_coding_cap == DP_CAP_ANSI_128B132B) { + mst_state->total_avail_slots = 64; + mst_state->start_slot = 0; + } + + DRM_DEBUG_KMS("%s coding format on mgr 0x%p\n", + (link_coding_cap == DP_CAP_ANSI_128B132B) ?"128b/132b":"8b/10b",
mst_state->mgr);need to fix indenting here, and wrap this to 100 chars
Quoted 49 lines
drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +0
-1@@ -4538,8 +4550,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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=%dmax=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-Quoted 1 line
total_avail_slots, ret);drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5226,7 +5238,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(struct drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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 */drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5255,7 +5267,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;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct
drm_atomic_state
*state)
break;
mutex_lock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_atomic_check(struct drm_atomic_state *state) · line 5439
Quoted 4 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0+ + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +this isn't correct - atomic checks aren't allowed to mutate anything besides the atomic state structure that we're checking since we don't know whether or not the display state is going to be committed when checking it. If we're storing state in mgr, that state needs to be written to mgr during the atomic commit instead of the atomic check.
...but, coming back to this MST code after being gone for a while, I think it might be time for us to stop worrying about the non-atomic state. Especially since there's only one driver using it; the legacy radeon.ko; and right now the plan is either to just drop MST support on radeon.ko or move the MST code it uses into radeon.ko.Which brings me to say - I think we can drop some of the hunks I mentioned above (e.g. the changes to
drm_dp_init_vcpianddrm_dp_find_vcpi_slotsI mentioned above). We can then just update the kdocs for these functions in a separate patch to clarify that now in addition to being deprecated, these functions are just broken and will eventually be removed.Quoted 5 lines
So - doing that allows us to get rid of
mgr->total_avail_slotsand mgr-Quoted 1 line
start_slotentirely, just set the slot info in the atomic state during atomiccheck, and then just rely on the atomic state for
drm_dp_atomic_find_vcpi_slots()and friends. Which seems much simpler to me, does this sound alrght with you?Thanks for the response,
That function is per port (
drm_dp_atomic_find_vcpi_slots) so not sure how that will work, maybe I don't understand what you mean?Also we only need to check this inside
drm_dp_mst_atomic_check_vcpi_alloc_limit(), which doesn't have a state, so we still need to have this on the mgr somehow.I was thinking we could add the slots(or some DP version indicator) inside the
drm_connector, and add a parameter todrm_dp_mst_atomic_check_vcpi_alloc_limit(int slots)and call it with this info viadrm_dp_mst_atomic_check().Bhawan
Quoted 58 lines
Quoted 58 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);
mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +4
-0@@ -5527,11 +5543,16 @@ 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) return -ENOMEM; + mst_state->total_avail_slots = 63; + mst_state->start_slot = 1; + mst_state->mgr = mgr; INIT_LIST_HEAD(&mst_state->vcpis);diff --git
a/include/drm/drm_dp_mst_helper.hb/include/drm/drm_dp_mst_helper.h
indexddb9231d0309..f8152dfb34ed100644include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; }; #define to_dp_mst_topology_mgr(x) container_of(x, struct drm_dp_mst_topology_mgr, base)@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;+ /**
+ * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */
+ u8total_avail_slots;include/drm/drm_dp_mst_helper.h +6
-0+ + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; +/**
* @funcs: Atomic helper callbacks
*/include/drm/drm_dp_mst_helper.h +0
-0@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dp
voiddrm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);
voiddrm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Lyude Paul
maintainerRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Bhawanpreet Lakha[snip]
Quoted 5 lines · Bhawanpreet Lakha
Thanks for the response,
That function is per port (
drm_dp_atomic_find_vcpi_slots) so not sure how that will work, maybe I don't understand what you mean?
Yeah - drm_dp_atomic_find_vcpi_slots() is just one part of the atomic helpers though, we can always add more. JFYI, the main atomic check function for MST is drm_dp_mst_atomic_check(). So we'd probably just want to add something into drm_dp_mst_topology_state that handles making sure we go through drm_dp_vcpi_allocation struct and recalculates everything in it. We might also want to add an atomic helper to set the new starting slot and slot count in the atomic state, then go through the current atomic topology state and ensure that we add any CRTCs that would need full modesets as a result of that info changing.
Quoted 4 lines
Also we only need to check this inside
drm_dp_mst_atomic_check_vcpi_alloc_limit(), which doesn't have a state, so we still need to have this on the mgr somehow.
It does, we pass drm_dp_mst_topology_state to it. So we could just add these fields there.
Quoted 5 lines
I was thinking we could add the slots(or some DP version indicator) inside the
drm_connector, and add a parameter todrm_dp_mst_atomic_check_vcpi_alloc_limit(int slots)and call it with this info viadrm_dp_mst_atomic_check().
So before I continue: I should note that some of the code in MST goes against what I'm about to say, in particular a lot of the payload updating functions in MST that keep their payload state outside of drm_dp_mst_topology_state and friends, but that's because some of this code is old and needs to be updated anyway (and some of it was actually just being kept around because we were worried about breaking radeon.ko, the only driver relying on behavior from the non-atomic paths in our topology helper). Also - I'm not sure what your prior experience is with modesetting in the linux kernel so my apologies if I'm explaining anything you already understand here.
Anyway-drm_connector wouldn't be the right place to put it because it's not part of the atomic state. The reason we have atomic modesetting in the first place is so that we can come up with a new display state, and then have the kernel verify the configurations in that new state and potentially reject it if we tried to program something that wouldn't have worked in hardware. As well, having it in drm_connector would mean that it wouldn't be safe to access unless we've somehow locked the drm_connector. drm_connector_state would be 'safe' to have this data in, but considering that we already have a private atomic state object for MST (drm_dp_mst_topology_state) it doesn't make much sense to keep MST info elsewhere.
Quoted 71 lines
Bhawan
Quoted 66 lines
Quoted 66 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +2
-0@@ -5527,11 +5543,16 @@ 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)
return-ENOMEM;
+ mst_state->total_avail_slots = 63;
+ mst_state->start_slot = 1;
+
mst_state->mgr = mgr;INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; };
#defineto_dp_mst_topology_mgr(x)container_of(x, struct drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +0
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;
+ /**
+ * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */
+ u8total_avail_slots;include/drm/drm_dp_mst_helper.h +6
-0+ + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; +/**
* @funcs: Atomic helper callbacks
*/include/drm/drm_dp_mst_helper.h +0
-0@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dp
voiddrm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);
voiddrm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Re: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Lyude PaulQuoted 208 lines · Lyude Paul
Some comments below (also, sorry again for the mixup on the last review!)
Quoted 40 lines · Bhawanpreet Lakha
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.
v2:
* Removeget_mst_link_encoding_cap
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkSigned-off-by Fangzhi Zuo <[email protected]>Signed-off-by Bhawanpreet Lakha <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++ drivers/gpu/drm/drm_dp_mst_topology.c | 35 +++++++++++++++---- include/drm/drm_dp_mst_helper.h | 13 +++++++ 3 files changed, 69 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0@@ -10612,6 +10612,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, #if defined(CONFIG_DRM_AMD_DC_DCN) struct dsc_mst_fairness_vars vars[MAX_PIPES]; #endif + struct drm_dp_mst_topology_state *mst_state; + struct drm_dp_mst_topology_mgr *mgr; trace_amdgpu_dm_atomic_check_begin(state);@@ -10819,6 +10821,32 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, lock_and_validation_needed = true; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static int amdgpu_dm_atomic_check(struct drm_device · line 10833
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9
-0+#if defined(CONFIG_DRM_AMD_DC_DCN ) + for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) { + struct amdgpu_dm_connector *aconnector; + struct drm_connector *connector; + struct drm_connector_list_iter iter; + u8 link_coding_cap; + + if (!mgr->mst_state ) + continue;extraneous space
Quoted 39 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +9
-0+ + drm_connector_list_iter_begin(dev, &iter); + drm_for_each_connector_iter(connector, &iter) { + int id = connector->index; + + if (id == mst_state->mgr->conn_base_id) { + aconnector =to_amdgpu_dm_connector (connector); + link_coding_cap =dc_link_dp_mst_decide_link_encoding_format (aconnector->dc_link); + drm_dp_mst_update_coding_cap(mst_state,
link_coding_cap);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-0+ + break; + } + } + drm_connector_list_iter_end(&iter); + + } +#endif /*** Streams and planes are reset when there are changes that affect * bandwidth. Anything that affects bandwidth needs to go through drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -3368,7 +3368,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);
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_find_vcpi_slots(struct · line 4326
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4321,7 +4321,7 @@ int drm_dp_find_vcpi_slots(structdrm_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;For reasons I will explain a little further in this email, we might want to drop this…
drivers/gpu/drm/drm_dp_mst_topology.c static int drm_dp_init_vcpi(struct · line 4337
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0return num_slots;}
drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4333,7 +4333,7 @@ static int drm_dp_init_vcpi(structdrm_dp_mst_topology_mgr *mgr, int ret; /* max. time slots - one slot for MTP header */ - if (slots > 63) + if (slots > mgr->total_avail_slots)…and this
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct · line 4512
Quoted 10 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0return -ENOSPC;vcpi->pbn = pbn;
drivers/gpu/drm/drm_dp_mst_topology.c +1
-0@@ -4507,6 +4507,18 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots); +void drm_dp_mst_update_coding_cap (struct drm_dp_mst_topology_state *mst_state,uint8_t link_coding_cap)Need some kdocs here
drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+{ + if (link_coding_cap == DP_CAP_ANSI_128B132B) { + mst_state->total_avail_slots = 64; + mst_state->start_slot = 0; + } + + DRM_DEBUG_KMS("%s coding format on mgr 0x%p\n", + (link_coding_cap == DP_CAP_ANSI_128B132B) ? "128b/132b":"8b/10b", mst_state->mgr);need to fix indenting here, and wrap this to 100 chars
Quoted 45 lines
drivers/gpu/drm/drm_dp_mst_topology.c +3
-0+} +EXPORT_SYMBOL (drm_dp_mst_update_coding_cap); +/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +2
-2@@ -4538,8 +4550,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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-Quoted 1 line
total_avail_slots, ret);drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -5226,7 +5238,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 */drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -5255,7 +5267,7 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(structdrm_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;
}drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_mst_atomic_check(struct drm_atomic_state · line 5440
Quoted 8 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0@@ -5421,6 +5433,10 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state) break; mutex_lock(&mgr->lock); + + mgr->start_slot = mst_state->start_slot; + mgr->total_avail_slots = mst_state->total_avail_slots; +this isn't correct - atomic checks aren't allowed to mutate anything besides the atomic state structure that we're checking since we don't know whether or not the display state is going to be committed when checking it. If we're storing state in mgr, that state needs to be written to mgr during the atomic commit instead of the atomic check.
...but, coming back to this MST code after being gone for a while, I think it might be time for us to stop worrying about the non-atomic state. Especially since there's only one driver using it; the legacy radeon.ko; and right now the plan is either to just drop MST support on radeon.ko or move the MST code it uses into radeon.ko.Which brings me to say - I think we can drop some of the hunks I mentioned above (e.g. the changes to
drm_dp_init_vcpianddrm_dp_find_vcpi_slotsI mentioned above). We can then just update the kdocs for these functions in a separate patch to clarify that now in addition to being deprecated, these functions are just broken and will eventually be removed.
Quoted 6 lines
So - doing that allows us to get rid of
mgr->total_avail_slotsand mgr-Quoted 1 line
start_slotentirely, just set the slot info in the atomic state during atomiccheck, and then just rely on the atomic state for
drm_dp_atomic_find_vcpi_slots()and friends. Which seems much simpler to me, does this sound alrght with you?
Thanks for the response,
That function is per port so not sure how that will work. Also we only need to check this inside drm_dp_mst_atomic_check_vcpi_alloc_limit(), which doesn't have a state.
We could add the slots(or some DP version indicator) inside the drm_connector, and add a parameter to drm_dp_mst_atomic_check_vcpi_alloc_limit(int slots)? and call it with this info via drm_dp_mst_atomic_check() and then update the mgr->slot in commit.
Bhawan
Quoted 65 lines
Quoted 65 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +5
-0@@ -5527,11 +5543,16 @@ 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) return -ENOMEM; + mst_state->total_avail_slots = 63; + mst_state->start_slot = 1; + mst_state->mgr = mgr; INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; }; #define to_dp_mst_topology_mgr(x) container_of(x, struct
drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +10
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; + /** + * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */ + u8 total_avail_slots; + + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; + /*** @funcs: Atomic helper callbacks */ @@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dpvoid drm_dp_mst_reset_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr,
structdrm_dp_mst_port*port);+void
drm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);void
drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Lyude Paul
maintainerRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
[more snip]
Quoted 7 lines · Bhawanpreet Lakha
Quoted 1 line
Thanks for the response,
That function is per port so not sure how that will work. Also we only need to check this inside
drm_dp_mst_atomic_check_vcpi_alloc_limit(), which doesn't have a state.
Quoted 5 lines
We could add the slots(or some DP version indicator) inside the
drm_connector, and add a parameter todrm_dp_mst_atomic_check_vcpi_alloc_limit(int slots)? and call it with this info viadrm_dp_mst_atomic_check()and then update themgr->slotin commit.
TBH - I think we can actually just get away with having all of this info in drm_dp_mst_topology_state
Quoted 70 lines
Bhawan
Quoted 65 lines
Quoted 65 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +2
-0@@ -5527,11 +5543,16 @@ 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)
return-ENOMEM;
+ mst_state->total_avail_slots = 63;
+ mst_state->start_slot = 1;
+
mst_state->mgr = mgr;INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; };
#defineto_dp_mst_topology_mgr(x)container_of(x, struct drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +0
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;
+ /**
+ * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */
+ u8total_avail_slots;include/drm/drm_dp_mst_helper.h +6
-0+ + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; +/**
* @funcs: Atomic helper callbacks
*/include/drm/drm_dp_mst_helper.h +0
-0@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dp
voiddrm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);
voiddrm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Re: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
I understand the mst_state argument its just that most of the mst functions are using mst_mgr/port structs and there is no easy way to extract the mst_state using mgr/port in these places (drm_dp_update_payload_part1, drm_dp_mst_allocate_vcpi, drm_dp_init_vcpi etc) where we need the slot info.
So either we need to keep a copy of the slots in the mgr because that's what most of the code is using right now or pass around the atomic state to get the mgr->state mapping. (I don't have much experience with the mst code so maybe I am missing some key detail here?)
Thanks,
Bhawan
Quoted 85 lines · Lyude Paul
[more snip]
Quoted 11 lines · Bhawanpreet Lakha
Thanks for the response,
That function is per port so not sure how that will work. Also we only need to check this inside
drm_dp_mst_atomic_check_vcpi_alloc_limit(), which doesn't have a state.We could add the slots(or some DP version indicator) inside the
drm_connector, and add a parameter todrm_dp_mst_atomic_check_vcpi_alloc_limit(int slots)? and call it with this info viadrm_dp_mst_atomic_check()and then update themgr->slotin commit.TBH - I think we can actually just get away with having all of this info in
drm_dp_mst_topology_stateQuoted 68 lines
Bhawan
Quoted 65 lines
Quoted 65 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +5
-0@@ -5527,11 +5543,16 @@ 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) return -ENOMEM; + mst_state->total_avail_slots = 63; + mst_state->start_slot = 1; + mst_state->mgr = mgr; INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; }; #define to_dp_mst_topology_mgr(x) container_of(x, struct
drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +10
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; + /** + * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */ + u8 total_avail_slots; + + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; + /*** @funcs: Atomic helper callbacks */ @@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dpvoid drm_dp_mst_reset_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr,
structdrm_dp_mst_port*port);+void
drm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);void
drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
Lyude Paul
maintainerRe: [PATCH] drm: Update MST First Link Slot Information Based on Encoding Format
First off, sidenote: I wonder if we even need total_avail_slots and could just use start_slot. Anyway, more productive comments below:
Quoted 6 lines · Bhawanpreet Lakha
I understand the
mst_stateargument its just that most of the mst functions are using mst_mgr/port structs and there is no easy way to extract themst_stateusing mgr/port in these places (drm_dp_update_payload_part1,drm_dp_mst_allocate_vcpi,drm_dp_init_vcpietc) where we need the slot info.
Ahh, I see why this might be confusing. I think surprisingly though, this actually should probably be OK. Mostly, two of these functions don't actually need the slot count and one I think I have a workaround for:
* drm_dp_init_vcpi() - This function does use the total slot count here:
if (slots > 63)
return -ENOSPC; However, drm_dp_init_vcpi() assigns the current payload which means it's called by the driver at commit time, not atomic check time. Since atomic commits are only allowed to happen after we've successfully tested the state in question, we aren't allowed to fail them in the middle of a commit - which is definitely what we're doing in drm_dp_init_vcpi(). So, I'd actually say we should either totally ignore this bit of drm_dp_init_vcpi() or preferably, just entirely drop it in a prerequisite patch.
(If you aren't familiar with atomic modesetting, the reason we "can't" just fail in the middle of committing a new atomic state is because we may very well have already committed that state to hardware partially. So, there's no nice way of aborting at that point without seriously complicating things - hence the need for having an atomic check before commits)
* drm_dp_mst_allocate_vcpi() - this seems to only be an issue because of drm_dp_init_vcpi(), and we additionally print the maximum number of slots in a drm_dbg_kms() message:
drm_dbg_kms(mgr->dev, "failed to init vcpi slots=%d max=63 ret=%d\n",
… Since we should have already decided
all of the new payloads by the time we're in drm_dp_mst_allocate_vcpi (again, since we're in atomic commit), that's probably not the best place for us to print that anyway. So, I think we'd be fine just dropping the "max=63" from that string.
* drm_dp_update_payload_part1() - This one does need the current slot count, you're right. I would normally say we should just fix this function and move the payload info over to the atomic state, which is the eventual plan, but doing that would require dealing with the radeon.ko MST mess which is probably too much to ask for with something as simple as this patch. I think I know a workaround though:
Let's keep this new slot info (e.g. num_slots, and possibly total_avail_slots if we keep that) in the MST atomic state, _but_ as a temporary solution we can instead add a start_slot argument to drm_dp_update_payload_part1(). That way we have an easy solution for making sure radeon still compiles, and atomic drivers can just extract the start_slot info themselves from the topology state and pass it into drm_dp_update_payload_part1(). Then I can get rid of that start_slots argument at a later date when I've started moving all of the payload info for MST into the atomic state.
If we do this solution though, we should definitely document in the patch and in the kdocs for drm_dp_update_payload_part1() that passing the start slot is a temporary workaround for non-atomic drivers, and will be removed when non-atomic portions of the MST helpers have been moved out of helpers and into atomic state.
Does this sound good? There's a lot of moving pieces here so hopefully I didn't miss anything
Quoted 4 lines
So either we need to keep a copy of the slots in the mgr because that's what most of the code is using right now or pass around the atomic state to get the
mgr->statemapping. (I don't have much experience with the mst code so maybe I am missing some key detail here?)
Worst case scenario, if there was something I missed that implies we DO need access to a mgr->state mapping, I might be OK with us using that in the interim for these patches. I don't think we need that quite yet as far as I can tell though.
Quoted 89 lines
Thanks,
Bhawan
Quoted 81 lines · Lyude Paul
[more snip]
Quoted 11 lines · Bhawanpreet Lakha
Thanks for the response,
That function is per port so not sure how that will work. Also we only need to check this inside
drm_dp_mst_atomic_check_vcpi_alloc_limit(), which doesn't have a state.We could add the slots(or some DP version indicator) inside the
drm_connector, and add a parameter todrm_dp_mst_atomic_check_vcpi_alloc_limit(int slots)? and call it with this info viadrm_dp_mst_atomic_check()and then update themgr->slotin commit.TBH - I think we can actually just get away with having all of this info in
drm_dp_mst_topology_stateQuoted 63 lines
Bhawan
Quoted 60 lines
Quoted 60 lines
ret = drm_dp_mst_atomic_check_mstb_bw_limit(mgr-
Quoted 1 line
mst_primary,
mst_state);
mutex_unlock(&mgr->lock);drivers/gpu/drm/drm_dp_mst_topology.c +2
-0@@ -5527,11 +5543,16 @@ 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)
return-ENOMEM;
+ mst_state->total_avail_slots = 63;
+ mst_state->start_slot = 1;
+
mst_state->mgr = mgr;INIT_LIST_HEAD(&mst_state->vcpis);include/drm/drm_dp_mst_helper.h +2
-0@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state { struct drm_private_state base; struct list_head vcpis; struct drm_dp_mst_topology_mgr *mgr; + u8 total_avail_slots; + u8 start_slot; };
#defineto_dp_mst_topology_mgr(x)container_of(x, struct drm_dp_mst_topology_mgr, base)include/drm/drm_dp_mst_helper.h +0
-0@@ -661,6 +663,16 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div;
+ /**
+ * @total_avail_slots: 63 for 8b/10b, 64 for 128/132b + */
+ u8total_avail_slots;include/drm/drm_dp_mst_helper.h +6
-0+ + /** + * @start_slot: 1 for 8b/10b, 0 for 128/132b + */ + u8 start_slot; +/**
* @funcs: Atomic helper callbacks
*/include/drm/drm_dp_mst_helper.h +0
-0@@ -806,6 +818,7 @@ int drm_dp_mst_get_vcpi_slots(struct
drm_dp_mst_topology_mgr*mgr, structdrm_dp
void drm_dp_mst_reset_vcpi_slots(structdrm_dp_mst_topology_mgr*mgr,
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
struct
drm_dp_mst_port*port);
+voiddrm_dp_mst_update_coding_cap(struct drm_dp_mst_topology_state *mst_state, uint8_t link_coding_cap);
void drm_dp_mst_deallocate_vcpi(structdrm_dp_mst_topology_mgr*mgr,
structdrm_dp_mst_port*port);
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
PATCH 2/4 drm: Update MST First Link Slot Information Based on Encoding Format
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.
v2:
* Move total/start slots to mst_state, and copy it to mst_mgr in atomic_check
v3:
* Only keep the slot info on the mst_state
* add a start_slot parameter to the payload function, to facilitate non atomic drivers (this is a temporary workaround and should be removed when we are moving out the non atomic driver helpers)
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 34 ++++++++++++++++--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +-- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +-- include/drm/drm_dp_mst_helper.h | 5 ++- 6 files changed, 40 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -251,7 +251,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( }/* It's OK for this to fail */ -drm_dp_update_payload_part1 (mst_mgr); +drm_dp_update_payload_part1 (mst_mgr,1 );/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or * AUX message. The sequence is slot 1-63 allocated sequence for each
drivers/gpu/drm/drm_dp_mst_topology.c +30 -4
@@ -3353,6 +3353,9 @@ static int drm_dp_destroy_payload_step2(struct drm_dp_mst_topology_mgr *mgr,/** * drm_dp_update_payload_part1() - Execute payload update part 1 * @mgr: manager to use. +* @start_slot: this is the cur slot +* NOTE: start_slot is a temporary workaround for non-atomic drivers, +* this will be removed when non-atomic mst helpers are moved out of the helper * * This iterates over all proposed virtual channels, and tries to * allocate space in the link for them. For 0->slots transitions,
@@ -3363,12 +3366,12 @@ static int drm_dp_destroy_payload_step2(struct drm_dp_mst_topology_mgr *mgr,* after calling this the driver should generate ACT and payload * packets. */ -int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr) +int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr,int start_slot) {struct drm_dp_payload req_payload;struct drm_dp_mst_port *port;int i, j; -int cur_slots =1 ; +int cur_slots = start_slot;bool skip;mutex_lock (&mgr->payload_lock);
@@ -4503,6 +4506,26 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, }EXPORT_SYMBOL (drm_dp_atomic_release_vcpi_slots); +/** +* drm_dp_mst_update_slots() - updates the slot info depending on the DP ecoding format +* @mst_state: mst_state to update +* @link_ecoding_cap: the ecoding format on the link +*/ +void drm_dp_mst_update_slots (struct drm_dp_mst_topology_state *mst_state,uint8_t link_ecoding_cap) +{ +if (link_ecoding_cap ==DP_CAP_ANSI_128B132B ) { + mst_state->total_avail_slots =64 ; + mst_state->start_slot =0 ; + }else { + mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; + } + +DRM_DEBUG_KMS ("%s ecoding format on mst_state 0x%p\n" , + (link_ecoding_cap ==DP_CAP_ANSI_128B132B ) ?"128b/132b" :"8b/10b" , mst_state->mgr); +} +EXPORT_SYMBOL (drm_dp_mst_update_slots); +/** * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel * @mgr: manager for this port
@@ -5222,7 +5245,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 = mst_state->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 */
@@ -5251,7 +5274,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, mst_state->total_avail_slots - avail_slots);return 0 ; }
@@ -5528,6 +5551,9 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,if (mst_state ==NULL )return -ENOMEM ; + mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; + mst_state->mgr = mgr;INIT_LIST_HEAD (&mst_state->vcpis);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -2
@@ -368,7 +368,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,drm_dp_mst_reset_vcpi_slots (&intel_dp->mst_mgr, connector->port); - ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr); + ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr,1 );if (ret) {drm_dbg_kms (&i915->drm,"failed to update payload %d\n" , ret); }
@@ -516,7 +516,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, intel_dp->active_mst_links++; - ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr); + ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr,1 );/* * Before Gen 12 this is not done as part of
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -1
@@ -1413,7 +1413,7 @@ nv50_mstm_prepare(struct nv50_mstm *mstm)int ret;NV_ATOMIC (drm,"%s: mstm prepare\n" , mstm->outp->base.base.name); - ret =drm_dp_update_payload_part1 (&mstm->mgr); + ret =drm_dp_update_payload_part1 (&mstm->mgr,1 );drm_for_each_encoder (encoder, mstm->outp->base.base.dev) {if (encoder->encoder_type ==DRM_MODE_ENCODER_DPMST ) {
drivers/gpu/drm/radeon/radeon_dp_mst.c +2 -2
@@ -423,7 +423,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)drm_dp_mst_allocate_vcpi (&radeon_connector->mst_port->mst_mgr, radeon_connector->port, mst_enc->pbn, slots); -drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr); +drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr,1 );radeon_dp_mst_set_be_cntl (primary, mst_enc, radeon_connector->mst_port->hpd.hpd, true);
@@ -452,7 +452,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)return ;drm_dp_mst_reset_vcpi_slots (&radeon_connector->mst_port->mst_mgr, mst_enc->port); -drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr); +drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr,1 );drm_dp_check_act_status (&radeon_connector->mst_port->mst_mgr);/* and this can also fail */
include/drm/drm_dp_mst_helper.h +4 -1
@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state {struct drm_private_state base;struct list_head vcpis;struct drm_dp_mst_topology_mgr *mgr; +u8 total_avail_slots; +u8 start_slot; };#define to_dp_mst_topology_mgr (x) container_of(x, struct drm_dp_mst_topology_mgr, base)
@@ -806,6 +808,7 @@ int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dpvoid drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_update_slots (struct drm_dp_mst_topology_state *mst_state,uint8_t link_ecoding_cap);void drm_dp_mst_deallocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);
@@ -815,7 +818,7 @@ int drm_dp_find_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, int pbn); -int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr); +int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr,int start_slot);int drm_dp_update_payload_part2 (struct drm_dp_mst_topology_mgr *mgr);
Signature · 1 line
2.25.1
Jani Nikula
maintainerRe: [PATCH 2/4] drm: Update MST First Link Slot Information Based on Encoding Format
Quoted 7 lines · Bhawanpreet Lakha
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.
Please send the patches as a fresh series instead of replying to the old thread, it's getting too confusing. Also, please Cc: intel-gfx mailing list, so you'll get our CI results on it. (Although I'm not sure how many machines we have with MST setups, but it's better than nothing.)
BR,
Jani.
Quoted 206 lines
v2:
* Move total/start slots tomst_state, and copy it tomst_mgrinatomic_checkv3:
* Only keep the slot info on themst_state
* add astart_slotparameter to the payload function, to facilitate non atomic drivers (this is a temporary workaround and should be removed when we are moving out the non atomic driver helpers)Signed-off-by Bhawanpreet Lakha <[email protected]>Signed-off-by Fangzhi Zuo <[email protected]>--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 34 ++++++++++++++++--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +-- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +-- include/drm/drm_dp_mst_helper.h | 5 ++- 6 files changed, 40 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1
-1@@ -251,7 +251,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( }/* It's OK for this to fail */ -drm_dp_update_payload_part1 (mst_mgr); +drm_dp_update_payload_part1 (mst_mgr,1 );/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or * AUX message. The sequence is slot 1-63 allocated sequence for each drivers/gpu/drm/drm_dp_mst_topology.c +30
-4@@ -3353,6 +3353,9 @@ static int drm_dp_destroy_payload_step2(struct drm_dp_mst_topology_mgr *mgr,/** * drm_dp_update_payload_part1() - Execute payload update part 1 * @mgr: manager to use. +* @start_slot: this is the cur slot +* NOTE: start_slot is a temporary workaround for non-atomic drivers, +* this will be removed when non-atomic mst helpers are moved out of the helper * * This iterates over all proposed virtual channels, and tries to * allocate space in the link for them. For 0->slots transitions, @@ -3363,12 +3366,12 @@ static int drm_dp_destroy_payload_step2(struct drm_dp_mst_topology_mgr *mgr,* after calling this the driver should generate ACT and payload * packets. */ -int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr) +int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr,int start_slot) {struct drm_dp_payload req_payload;struct drm_dp_mst_port *port;int i, j; -int cur_slots =1 ; +int cur_slots = start_slot;bool skip;mutex_lock (&mgr->payload_lock);@@ -4503,6 +4506,26 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, }EXPORT_SYMBOL (drm_dp_atomic_release_vcpi_slots); +/** +* drm_dp_mst_update_slots() - updates the slot info depending on the DP ecoding format +* @mst_state: mst_state to update +* @link_ecoding_cap: the ecoding format on the link +*/ +void drm_dp_mst_update_slots (struct drm_dp_mst_topology_state *mst_state,uint8_t link_ecoding_cap) +{ +if (link_ecoding_cap ==DP_CAP_ANSI_128B132B ) { + mst_state->total_avail_slots =64 ; + mst_state->start_slot =0 ; + }else { + mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; + } + +DRM_DEBUG_KMS ("%s ecoding format on mst_state 0x%p\n" , + (link_ecoding_cap ==DP_CAP_ANSI_128B132B ) ?"128b/132b" :"8b/10b" , mst_state->mgr); +} +EXPORT_SYMBOL (drm_dp_mst_update_slots); +/** * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel * @mgr: manager for this port @@ -5222,7 +5245,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 = mst_state->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 */ @@ -5251,7 +5274,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, mst_state->total_avail_slots - avail_slots);return 0 ; }@@ -5528,6 +5551,9 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,if (mst_state ==NULL )return -ENOMEM ; + mst_state->total_avail_slots =63 ; + mst_state->start_slot =1 ; + mst_state->mgr = mgr;INIT_LIST_HEAD (&mst_state->vcpis);drivers/gpu/drm/i915/display/intel_dp_mst.c +2
-2@@ -368,7 +368,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,drm_dp_mst_reset_vcpi_slots (&intel_dp->mst_mgr, connector->port); - ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr); + ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr,1 );if (ret) {drm_dbg_kms (&i915->drm,"failed to update payload %d\n" , ret); }@@ -516,7 +516,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, intel_dp->active_mst_links++; - ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr); + ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr,1 );/* * Before Gen 12 this is not done as part of drivers/gpu/drm/nouveau/dispnv50/disp.c +1
-1@@ -1413,7 +1413,7 @@ nv50_mstm_prepare(struct nv50_mstm *mstm)int ret;NV_ATOMIC (drm,"%s: mstm prepare\n" , mstm->outp->base.base.name); - ret =drm_dp_update_payload_part1 (&mstm->mgr); + ret =drm_dp_update_payload_part1 (&mstm->mgr,1 );drm_for_each_encoder (encoder, mstm->outp->base.base.dev) {if (encoder->encoder_type ==DRM_MODE_ENCODER_DPMST ) {drivers/gpu/drm/radeon/radeon_dp_mst.c +2
-2@@ -423,7 +423,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)drm_dp_mst_allocate_vcpi (&radeon_connector->mst_port->mst_mgr, radeon_connector->port, mst_enc->pbn, slots); -drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr); +drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr,1 );radeon_dp_mst_set_be_cntl (primary, mst_enc, radeon_connector->mst_port->hpd.hpd, true);@@ -452,7 +452,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)return ;drm_dp_mst_reset_vcpi_slots (&radeon_connector->mst_port->mst_mgr, mst_enc->port); -drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr); +drm_dp_update_payload_part1 (&radeon_connector->mst_port->mst_mgr,1 );drm_dp_check_act_status (&radeon_connector->mst_port->mst_mgr);/* and this can also fail */ include/drm/drm_dp_mst_helper.h +4
-1@@ -554,6 +554,8 @@ struct drm_dp_mst_topology_state {struct drm_private_state base;struct list_head vcpis;struct drm_dp_mst_topology_mgr *mgr; +u8 total_avail_slots; +u8 start_slot; };#define to_dp_mst_topology_mgr (x) container_of(x, struct drm_dp_mst_topology_mgr, base)@@ -806,6 +808,7 @@ int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dpvoid drm_dp_mst_reset_vcpi_slots (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); +void drm_dp_mst_update_slots (struct drm_dp_mst_topology_state *mst_state,uint8_t link_ecoding_cap);void drm_dp_mst_deallocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);@@ -815,7 +818,7 @@ int drm_dp_find_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, int pbn); -int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr); +int drm_dp_update_payload_part1 (struct drm_dp_mst_topology_mgr *mgr,int start_slot);int drm_dp_update_payload_part2 (struct drm_dp_mst_topology_mgr *mgr);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Lyude Paul
maintainerRe: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
In reply to Zuo, Jerry(sorry - I just wrote a second response to your email I meant to send to your coworker Jerry Zuo! You can ignore it)
Quoted 215 lines · Jerry
[AMD Official Use Only]
Quoted 97 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: August 30, 2021 4:00 PM
To: Zuo, Jerry <[email protected]>; [email protected]
Cc: Wentland, Harry <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Lin, Wayne <[email protected]>
Subject: Re: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding FormatQuoted 50 lines · Fangzhi Zuo
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 <[email protected]>---
drivers/gpu/drm/drm_dp_mst_topology.c | 27
++++++++++++++++++++-------
include/drm/drm_dp_mst_helper.h | 9 +++++++++2 files changed, 29 insertions(+), 7 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -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(structdrm_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;
returnnum_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4335,7 +4335,7 @@ static int drm_dp_init_vcpi(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct · line 4513
Quoted 5 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-0@@ -4509,6 +4509,17 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots); +void drm_dp_mst_update_encoding_cap(struct
drm_dp_mst_topology_mgrdrivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4522
Quoted 13 lines
drivers/gpu/drm/drm_dp_mst_topology.c +11
-0+*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); +This seems to be missing kdocs, can you fix that?
Also - I'm not convinced this is all of the work we have to do, as there's no
locking taking place here in this function. If we're changing the number of
available VCPI slots that we have, we need to be able to factor that into the
atomic check logic which means that we can't rely on mgr->* for any kind of
data that isn't guaranteed to remain consistent throughout the lifetime of the
driver or topology. (Note that some of the old MST code didn't follow this logic, so I wouldn't be surprised if there's still exceptions to this we need to
clean up).Quoted 5 lines
Note that I still expect we'll have to keep some sort of track of the current
total slot count in the topology mgr, but that should be reflecting the currently programmed state and not be relied on from our atomic check.Thanks Lyude for your comments.
Seems I should keep existing code to keep track of current slot status in mgr.
That information is getting updated each time when topology change detected. That slot information saved in mgr is a sort of static, and could only be used
for debug purpose to track what is the current encoding format.Quoted 4 lines
IMHO - the correct way we should go about adding support for this is to add
something intodrm_dp_mst_topology_stateand integrate this into the atomic check helpers.The slot information should also be added into
drm_dp_mst_topology_stateto reflect the real-time slot status.I'd like to confirm the best place to get slot count info. updated. Should the update be done within
&drm_mode_config_funcs.atomic_check(), before new stream is created, OR
should be updated withindrm_dp_mst_atomic_check()?The updated slot count will be used in
drm_dp_mst_atomic_check()to check slot limit,
and indrm_dp_update_payload_part1()as initialcur_slots.Quoted 83 lines
drivers/gpu/drm/drm_dp_mst_topology.c
Quoted 21 lines
/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +3
-2@@ -4540,8 +4551,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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-Quoted 1 line
total_avail_slots, ret);
drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5228,7 +5239,7 @@drm_dp_mst_atomic_check_vcpi_alloc_limit(struct
Quoted 46 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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(structdrm_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;
}drivers/gpu/drm/drm_dp_mst_topology.c +2
-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)(quoted diff) +0
-0
b/include/drm/drm_dp_mst_helper.hindexddb9231d0309..eac5ce48f214100644include/drm/drm_dp_mst_helper.h +2
-0@@ -661,6 +661,15 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; + /** +* @total_avail_slots: available slots for data transmission include/drm/drm_dp_mst_helper.h struct drm_dp_mst_topology_mgr { · line 675
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +7
-0+*/ + u8 total_avail_slots; + /** + * @start_slot: first slot index for data transmission + */ + u8 start_slot; + /*** @funcs: Atomic helper callbacks */ --
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Lyude Paul
maintainerRe: [PATCH 1/2] drm: Update MST First Link Slot Information Based on Encoding Format
...I meant Wayne Lin, whoops. been going through a lot of emails today 😅
Quoted 228 lines · Lyude Paul
(sorry - I just wrote a second response to your email I meant to send to your
coworker Jerry Zuo! You can ignore it)Quoted 222 lines · Jerry
[AMD Official Use Only]
Quoted 102 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: August 30, 2021 4:00 PM
To: Zuo, Jerry <[email protected]>; [email protected]
Cc: Wentland, Harry <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Lin, Wayne <[email protected]>
Subject: Re: [PATCH 1/2] drm: Update MST First Link Slot Information Based
on Encoding FormatQuoted 50 lines · Fangzhi Zuo
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 <[email protected]>---
drivers/gpu/drm/drm_dp_mst_topology.c | 27
++++++++++++++++++++-------
include/drm/drm_dp_mst_helper.h | 9 +++++++++2 files changed, 29 insertions(+), 7 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -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(structdrm_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;
returnnum_slots;
}drivers/gpu/drm/drm_dp_mst_topology.c +1
-1@@ -4335,7 +4335,7 @@ static int drm_dp_init_vcpi(structdrm_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;drivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct · line 4513
Quoted 5 lines
drivers/gpu/drm/drm_dp_mst_topology.c +1
-0@@ -4509,6 +4509,17 @@ int drm_dp_atomic_release_vcpi_slots(structdrm_atomic_state *state, } EXPORT_SYMBOL(drm_dp_atomic_release_vcpi_slots); +void drm_dp_mst_update_encoding_cap(struct
drm_dp_mst_topology_mgrdrivers/gpu/drm/drm_dp_mst_topology.c int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, · line 4522
Quoted 13 lines
drivers/gpu/drm/drm_dp_mst_topology.c +11
-0+*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); +This seems to be missing kdocs, can you fix that?
Also - I'm not convinced this is all of the work we have to do, as there's
no
locking taking place here in this function. If we're changing the number of
available VCPI slots that we have, we need to be able to factor that into
the
atomic check logic which means that we can't rely on mgr->* for any kind of
data that isn't guaranteed to remain consistent throughout the lifetime of
the
driver or topology. (Note that some of the old MST code didn't follow this
logic, so I wouldn't be surprised if there's still exceptions to this we need to
clean up).Quoted 5 lines
Note that I still expect we'll have to keep some sort of track of the current
total slot count in the topology mgr, but that should be reflecting the currently programmed state and not be relied on from our atomic check.Thanks Lyude for your comments.
Seems I should keep existing code to keep track of current slot status in mgr.
That information is getting updated each time when topology change detected.
That slot information saved in mgr is a sort of static, and could only be used
for debug purpose to track what is the current encoding format.Quoted 4 lines
IMHO - the correct way we should go about adding support for this is to add
something intodrm_dp_mst_topology_stateand integrate this into the atomic check helpers.The slot information should also be added into
drm_dp_mst_topology_stateto
reflect the real-time slot status.I'd like to confirm the best place to get slot count info. updated. Should the update be done within
&drm_mode_config_funcs.atomic_check(), before new stream is created, OR
should be updated withindrm_dp_mst_atomic_check()?The updated slot count will be used in
drm_dp_mst_atomic_check()to check slot limit,
and indrm_dp_update_payload_part1()as initialcur_slots.Quoted 83 lines
drivers/gpu/drm/drm_dp_mst_topology.c
Quoted 21 lines
/**
*drm_dp_mst_allocate_vcpi()- Allocate a virtual channel
* @mgr: manager for this portdrivers/gpu/drm/drm_dp_mst_topology.c +3
-2@@ -4540,8 +4551,8 @@ bool drm_dp_mst_allocate_vcpi(structdrm_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-Quoted 1 line
total_avail_slots, ret);
drm_dp_mst_topology_put_port(port); goto out;
}drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -5228,7 +5239,7 @@drm_dp_mst_atomic_check_vcpi_alloc_limit(struct
Quoted 46 lines
drivers/gpu/drm/drm_dp_mst_topology.c +0
-0drm_dp_mst_topology_mgr *mgr,struct
drm_dp_mst_topology_state*mst_state)
{
structdrm_dp_vcpi_allocation*vcpi;
- intavail_slots= 63,payload_count= 0;
+ intavail_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(structdrm_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;
}drivers/gpu/drm/drm_dp_mst_topology.c +2
-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)(quoted diff) +0
-0
b/include/drm/drm_dp_mst_helper.hindexddb9231d0309..eac5ce48f214100644include/drm/drm_dp_mst_helper.h +2
-0@@ -661,6 +661,15 @@ struct drm_dp_mst_topology_mgr {*/ int pbn_div; + /** +* @total_avail_slots: available slots for data transmission include/drm/drm_dp_mst_helper.h struct drm_dp_mst_topology_mgr { · line 675
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +7
-0+*/ + u8 total_avail_slots; + /** + * @start_slot: first slot index for data transmission + */ + u8 start_slot; + /*** @funcs: Atomic helper callbacks */ --
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
PATCH 2/2 drm/amdgpu: Example Usage in AMDGPU
In reply to Fangzhi Zuo1. Decide MST Link Encoding Cap
2. Update MST First Link Slot Information
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++- .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 ++++++++++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -1
@@ -2302,6 +2302,7 @@ static int dm_resume(void *handle)dc_sink_release (aconnector->dc_sink); aconnector->dc_sink =NULL ;amdgpu_dm_update_connector_after_detect (aconnector); +get_mst_link_encoding_cap (aconnector);mutex_unlock (&aconnector->hpd_lock); }drm_connector_list_iter_end (&iter);
@@ -2673,6 +2674,7 @@ static void handle_hpd_irq(void *param)if (aconnector->base.force ==DRM_FORCE_UNSPECIFIED )drm_kms_helper_hotplug_event (dev); } +get_mst_link_encoding_cap (aconnector);mutex_unlock (&aconnector->hpd_lock); }
@@ -3844,7 +3846,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)amdgpu_dm_set_psr_caps (link); } - +get_mst_link_encoding_cap (aconnector); }/* Software is initialized. Now we can register interrupt handlers. */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +10 -0
@@ -439,6 +439,16 @@ static const struct drm_dp_mst_topology_cbs dm_mst_cbs = { .add_connector = dm_dp_add_mst_connector, }; +void get_mst_link_encoding_cap (struct amdgpu_dm_connector *aconnector) +{ +u8 link_encoding_cap; + +if (aconnector->dc_link->type == dc_connection_mst_branch) { + link_encoding_cap =dc_link_dp_mst_decide_link_encoding_format (aconnector->dc_link); +drm_dp_mst_update_coding_cap (&aconnector->mst_mgr, link_encoding_cap); + } +} +void amdgpu_dm_initialize_dp_connector (struct amdgpu_display_manager *dm,struct amdgpu_dm_connector *aconnector,int link_index)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +2 -0
@@ -35,6 +35,8 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,struct amdgpu_dm_connector *aconnector, int link_index); +void get_mst_link_encoding_cap (struct amdgpu_dm_connector *aconnector); +void dm_dp_create_fake_mst_encoders (struct amdgpu_device *adev);
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH 2/2] drm/amdgpu: Example Usage in AMDGPU
Thank you for the patch! Yet something to improve:
Hi Fangzhi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master v5.14-rc7 next-20210827] [cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Fangzhi-Zuo/Update-128b-132b-MST-Slot-Information/20210828-082044 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-a005-20210827 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 4e1a164d7bd53653f79decc121afe784d2fde0a7)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/9b4444b8b7cc43f098ef1f3a234c304c0e537754
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Fangzhi-Zuo/Update-128b-132b-MST-Slot-Information/20210828-082044 git checkout 9b4444b8b7cc43f098ef1f3a234c304c0e537754
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:447:23: error: implicit declaration of function 'dc_link_dp_mst_decide_link_encoding_format' [-Werror,-Wimplicit-function-declaration]
link_encoding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link);
^
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c:448:3: error: implicit declaration of function 'drm_dp_mst_update_coding_cap' [-Werror,-Wimplicit-function-declaration]
drm_dp_mst_update_coding_cap(&aconnector->mst_mgr, link_encoding_cap);
^2 errors generated.
vim +/dc_link_dp_mst_decide_link_encoding_format +447 drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.c
441
442 void get_mst_link_encoding_cap(struct amdgpu_dm_connector *aconnector)
443 {
444 u8 link_encoding_cap;
445
446 if (aconnector->dc_link->type == dc_connection_mst_branch) {
> 447 link_encoding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link); > 448 drm_dp_mst_update_coding_cap(&aconnector->mst_mgr, link_encoding_cap);
449 }
450 }
451
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org