DSC MST support for DRM and AMDGPU
Subsystems (7)
v7 cover DSC MST support for DRM and AMDGPU
From: Mikita Lipski <[email protected]>
Patches are based of amd-staging-drm-next, the follow up set of patches will be sent for drm-tip
This set of patches is a continuation of DSC enablement patches for AMDGPU. This set enables DSC on MST. It also contains implementation of both encoder and connector atomic check routines.
These patches have been introduced in multiple iterations to the mailing list before. These patches were developed by David Francis as part of his work on DSC.
v2: squashed previously 3 separate atomic check patches, separate atomic check for dsc connectors, track vcpi and pbn on connectors.
v3: Moved modeset trigger on affected MST displays to DRM
v4: Fix warnings, use current mode's bpc rather than display's maximum capable one
v5: Moving branch's bandwidth validation to DRM, Added function to enable DSC per port in DRM
v6: Compute fair share uses DRM helper for BW validation
v7: Add helper to overwrite PBN divider per slot,
Add helper function to trigger modeset on affected DSC connectors
in DRM
David Francis (9):
drm/dp_mst: Add PBN calculation for DSC modes drm/dp_mst: Parse FEC capability on MST ports drm/dp_mst: Add MST support to DP DPCD R/W functions drm/dp_mst: Fill branch->num_ports
drm/dp_mst: Add helpers for MST DSC and virtual DPCD aux drm/amd/display: Initialize DSC PPS variables to 0 drm/amd/display: Validate DSC caps on MST endpoints drm/amd/display: Write DSC enable to MST DPCD drm/amd/display: MST DSC compute fair share drm/dp_mst: Add new quirk for Synaptics MST hubs
Mikita Lipski (8):
drm/dp_mst: Manually overwrite PBN divider for calculating timeslots drm/dp_mst: Add DSC enablement helpers to DRM
drm/dp_mst: Add branch bandwidth validation to MST atomic check drm/dp_mst: Add helper to trigger modeset on affected DSC MST CRTCs drm/amd/display: Add PBN per slot calculation for DSC drm/amd/display: Recalculate VCPI slots for new DSC connectors drm/amd/display: Trigger modesets on MST DSC connectors
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 117 ++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 19 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 395 ++++++++++++++++- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 5 + .../drm/amd/display/dc/core/dc_link_hwss.c | 3 + .../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 3 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 + drivers/gpu/drm/drm_dp_aux_dev.c | 12 +- drivers/gpu/drm/drm_dp_helper.c | 33 +- drivers/gpu/drm/drm_dp_mst_topology.c | 401 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 6 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- include/drm/drm_dp_helper.h | 7 + include/drm/drm_dp_mst_helper.h | 19 +- 17 files changed, 989 insertions(+), 47 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 1/17 drm/dp_mst: Add PBN calculation for DSC modes
From: David Francis <[email protected]>
With DSC, bpp can be fractional in multiples of 1/16.
Change drm_dp_calc_pbn_mode to reflect this, adding a new parameter bool dsc. When this parameter is true, treat the bpp parameter as having units not of bits per pixel, but 1/16 of a bit per pixel
v2: Don't add separate function for this
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 16 ++++++++++++---- drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 ++- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ++- drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- include/drm/drm_dp_mst_helper.h | 3 +-- 6 files changed, 19 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -4967,7 +4967,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, is_y420); bpp =convert_dc_color_depth_into_bpc (color_depth) *3 ; clock = adjusted_mode->clock; - dm_new_connector_state->pbn =drm_dp_calc_pbn_mode (clock, bpp); + dm_new_connector_state->pbn =drm_dp_calc_pbn_mode (clock, bpp, false); } dm_new_connector_state->vcpi_slots = drm_dp_atomic_find_vcpi_slots(state, mst_mgr,
drivers/gpu/drm/drm_dp_mst_topology.c +12 -4
@@ -3534,10 +3534,11 @@ EXPORT_SYMBOL(drm_dp_check_act_status);* drm_dp_calc_pbn_mode() - Calculate the PBN for a mode. * @clock: dot clock for the mode * @bpp: bpp for the mode. +* @dsc: DSC mode. If true, bpp has units of 1/16 of a bit per pixel * * This uses the formula in the spec to calculate the PBN value for a mode. */ -int drm_dp_calc_pbn_mode (int clock,int bpp) +int drm_dp_calc_pbn_mode (int clock,int bpp,bool dsc) {u64 kbps;s64 peak_kbps;
@@ -3555,11 +3556,18 @@ int drm_dp_calc_pbn_mode(int clock, int bpp)* peak_kbps *= (1006/1000) * peak_kbps *= (64/54) * peak_kbps *= 8 convert to bytes +* +* If the bpp is in units of 1/16, further divide by 16. Put this +* factor in the numerator rather than the denominator to avoid +* integer overflow */ numerator =64 *1006 ; denominator =54 *8 *1000 *1000 ; +if (dsc) + numerator /=16 ; + kbps *= numerator; peak_kbps =drm_fixp_from_fraction (kbps, denominator);
@@ -3570,19 +3578,19 @@ EXPORT_SYMBOL(drm_dp_calc_pbn_mode);static int test_calc_pbn_mode (void ) {int ret; - ret =drm_dp_calc_pbn_mode (154000 ,30 ); + ret =drm_dp_calc_pbn_mode (154000 ,30 , false);if (ret !=689 ) {DRM_ERROR ("PBN calculation test failed - clock %d, bpp %d, expected PBN %d, actual PBN %d.\n" ,154000 ,30 ,689 , ret);return -EINVAL ; } - ret =drm_dp_calc_pbn_mode (234000 ,30 ); + ret =drm_dp_calc_pbn_mode (234000 ,30 , false);if (ret !=1047 ) {DRM_ERROR ("PBN calculation test failed - clock %d, bpp %d, expected PBN %d, actual PBN %d.\n" ,234000 ,30 ,1047 , ret);return -EINVAL ; } - ret =drm_dp_calc_pbn_mode (297000 ,24 ); + ret =drm_dp_calc_pbn_mode (297000 ,24 , false);if (ret !=1063 ) {DRM_ERROR ("PBN calculation test failed - clock %d, bpp %d, expected PBN %d, actual PBN %d.\n" ,297000 ,24 ,1063 , ret);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -1
@@ -61,7 +61,8 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, crtc_state->pipe_bpp = bpp; crtc_state->pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, - crtc_state->pipe_bpp); + crtc_state->pipe_bpp, + false); slots =drm_dp_atomic_find_vcpi_slots (state, &intel_dp->mst_mgr, port, crtc_state->pbn);
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
@@ -778,7 +778,8 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,if (!state->duplicated) asyh->dp.pbn =drm_dp_calc_pbn_mode (crtc_state->adjusted_mode.clock, - connector->display_info.bpc *3 ); + connector->display_info.bpc *3 , + false);if (crtc_state->mode_changed) { slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr,
drivers/gpu/drm/radeon/radeon_dp_mst.c +1 -1
@@ -514,7 +514,7 @@ static bool radeon_mst_mode_fixup(struct drm_encoder *encoder, mst_enc = radeon_encoder->enc_priv; - mst_enc->pbn =drm_dp_calc_pbn_mode (adjusted_mode->clock, bpp); + mst_enc->pbn =drm_dp_calc_pbn_mode (adjusted_mode->clock, bpp, false); mst_enc->primary->active_device = mst_enc->primary->devices & mst_enc->connector->devices; DRM_DEBUG_KMS("setting active device to %08x from %08x %08x for encoder %d\n",
include/drm/drm_dp_mst_helper.h +1 -2
@@ -610,8 +610,7 @@ bool drm_dp_mst_port_has_audio(struct drm_dp_mst_topology_mgr *mgr,struct edid *drm_dp_mst_get_edid (struct drm_connector *connector,struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port); -int drm_dp_calc_pbn_mode (int clock,int bpp); - +int drm_dp_calc_pbn_mode (int clock,int bpp,bool dsc);bool drm_dp_mst_allocate_vcpi (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port,int pbn,int slots);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 20191116220128.16598-1-mikita.lipski-5C7GfCeVMHo@public.gmane.org
PATCH v7 2/17 drm/dp_mst: Parse FEC capability on MST ports
From: David Francis <[email protected]>
As of DP1.4, ENUM_PATH_RESOURCES returns a bit indicating if FEC can be supported up to that point in the MST network.
The bit is the first byte of the ENUM_PATH_RESOURCES ack reply, bottom-most bit (refer to section 2.11.9.4 of DP standard, v1.4)
That value is needed for FEC and DSC support
Store it on drm_dp_mst_port
--- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ include/drm/drm_dp_mst_helper.h | 3 +++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -0
@@ -553,6 +553,7 @@ static bool drm_dp_sideband_parse_enum_path_resources_ack(struct drm_dp_sideband {int idx =1 ; repmsg->u.path_resources.port_number = (raw->msg[idx] >>4 ) &0xf ; + repmsg->u.path_resources.fec_capable = raw->msg[idx] &0x1 ; idx++;if (idx > raw->curlen) goto fail_len;
@@ -2183,6 +2184,7 @@ static int drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,DRM_DEBUG_KMS ("enum path resources %d: %d %d\n" , txmsg->reply.u.path_resources.port_number, txmsg->reply.u.path_resources.full_payload_bw_number, txmsg->reply.u.path_resources.avail_payload_bw_number); port->available_pbn = txmsg->reply.u.path_resources.avail_payload_bw_number; + port->fec_capable = txmsg->reply.u.path_resources.fec_capable; } }
include/drm/drm_dp_mst_helper.h +3 -0
@@ -108,6 +108,8 @@ struct drm_dp_mst_port {* audio-capable. */ bool has_audio; + +bool fec_capable; };/**
@@ -312,6 +314,7 @@ struct drm_dp_port_number_req {struct drm_dp_enum_path_resources_ack_reply {u8 port_number; +bool fec_capable;u16 full_payload_bw_number;u16 avail_payload_bw_number; };
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 3/17 drm/dp_mst: Add MST support to DP DPCD R/W functions
In reply to a message not in the archiveFrom: David Francis <[email protected]>
Instead of having drm_dp_dpcd_read/write and drm_dp_mst_dpcd_read/write as entry points into the aux code, have drm_dp_dpcd_read/write handle both.
This means that DRM drivers can make MST DPCD read/writes.
v2: Fix spacing
v3: Dump dpcd access on MST read/writes
v4: Fix calling wrong function on DPCD write
--- drivers/gpu/drm/drm_dp_aux_dev.c | 12 ++---------- drivers/gpu/drm/drm_dp_helper.c | 31 +++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 20 deletions(-)
drivers/gpu/drm/drm_dp_aux_dev.c +2 -10
@@ -163,11 +163,7 @@ static ssize_t auxdev_read_iter(struct kiocb *iocb, struct iov_iter *to)break ; } -if (aux_dev->aux->is_remote) - res =drm_dp_mst_dpcd_read (aux_dev->aux, pos, buf, - todo); -else - res =drm_dp_dpcd_read (aux_dev->aux, pos, buf, todo); + res =drm_dp_dpcd_read (aux_dev->aux, pos, buf, todo);if (res <=0 )break ;
@@ -215,11 +211,7 @@ static ssize_t auxdev_write_iter(struct kiocb *iocb, struct iov_iter *from)break ; } -if (aux_dev->aux->is_remote) - res =drm_dp_mst_dpcd_write (aux_dev->aux, pos, buf, - todo); -else - res =drm_dp_dpcd_write (aux_dev->aux, pos, buf, todo); + res =drm_dp_dpcd_write (aux_dev->aux, pos, buf, todo);if (res <=0 )break ;
drivers/gpu/drm/drm_dp_helper.c +21 -10
@@ -32,6 +32,8 @@#include <drm/drm_dp_helper.h> #include <drm/drm_print.h> #include <drm/drm_vblank.h> +#include <drm/drm_dp_mst_helper.h> +#include <drm/drmP.h> #include "drm_crtc_helper_internal.h"
@@ -251,7 +253,7 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request,/** * drm_dp_dpcd_read() - read a series of bytes from the DPCD -* @aux: DisplayPort AUX channel +* @aux: DisplayPort AUX channel (SST or MST) * @offset: address of the (first) register to read * @buffer: buffer to store the register values * @size: number of bytes in @buffer
@@ -280,13 +282,18 @@ ssize_t drm_dp_dpcd_read(struct drm_dp_aux *aux, unsigned int offset,* We just have to do it before any DPCD access and hope that the * monitor doesn't power down exactly after the throw away read. */ - ret =drm_dp_dpcd_access (aux,DP_AUX_NATIVE_READ ,DP_DPCD_REV , buffer, -1 ); -if (ret !=1 ) - goto out; +if (!aux->is_remote) { + ret =drm_dp_dpcd_access (aux,DP_AUX_NATIVE_READ ,DP_DPCD_REV , + buffer,1 ); +if (ret !=1 ) + goto out; + } - ret =drm_dp_dpcd_access (aux,DP_AUX_NATIVE_READ , offset, buffer, - size); +if (aux->is_remote) + ret =drm_dp_mst_dpcd_read (aux, offset, buffer, size); +else + ret =drm_dp_dpcd_access (aux,DP_AUX_NATIVE_READ , offset, + buffer, size); out:drm_dp_dump_access (aux,DP_AUX_NATIVE_READ , offset, buffer, ret);
@@ -296,7 +303,7 @@ EXPORT_SYMBOL(drm_dp_dpcd_read);/** * drm_dp_dpcd_write() - write a series of bytes to the DPCD -* @aux: DisplayPort AUX channel +* @aux: DisplayPort AUX channel (SST or MST) * @offset: address of the (first) register to write * @buffer: buffer containing the values to write * @size: number of bytes in @buffer
@@ -313,8 +320,12 @@ ssize_t drm_dp_dpcd_write(struct drm_dp_aux *aux, unsigned int offset, {int ret; - ret =drm_dp_dpcd_access (aux,DP_AUX_NATIVE_WRITE , offset, buffer, - size); +if (aux->is_remote) + ret =drm_dp_mst_dpcd_write (aux, offset, buffer, size); +else + ret =drm_dp_dpcd_access (aux,DP_AUX_NATIVE_WRITE , offset, + buffer, size); +drm_dp_dump_access (aux,DP_AUX_NATIVE_WRITE , offset, buffer, ret);return ret; }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 4/17 drm/dp_mst: Fill branch->num_ports
In reply to a message not in the archiveFrom: David Francis <[email protected]>
This field on drm_dp_mst_branch was never filled
It is initialized to zero when the port is kzallocced. When a port is added to the list, increment num_ports, and when a port is removed from the list, decrement num_ports.
v2: remember to decrement on port removal
v3: don't explicitly init to 0
--- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +2 -0
@@ -1669,6 +1669,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,mutex_lock (&mstb->mgr->lock);drm_dp_mst_topology_get_port (port);list_add (&port->next, &mstb->ports); + mstb->num_ports++;mutex_unlock (&mstb->mgr->lock); }
@@ -1703,6 +1704,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,/* remove it from the port list */ mutex_lock (&mstb->mgr->lock);list_del (&port->next); + mstb->num_ports--;mutex_unlock (&mstb->mgr->lock);/* drop port list reference */ drm_dp_mst_topology_put_port (port);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 6/17 drm/dp_mst: Add new quirk for Synaptics MST hubs
In reply to a message not in the archiveFrom: Mikita Lipski <[email protected]>
Synaptics DP1.4 hubs (BRANCH_ID 0x90CC24) do not support virtual DPCD registers, but do support DSC. The DSC caps can be read from the physical aux, like in SST DSC. These hubs have many different DEVICE_IDs. Add a new quirk to detect this case.
--- drivers/gpu/drm/drm_dp_helper.c | 2 ++ drivers/gpu/drm/drm_dp_mst_topology.c | 27 +++++++++++++++++++++++++++ include/drm/drm_dp_helper.h | 7 +++++++ 3 files changed, 36 insertions(+)
drivers/gpu/drm/drm_dp_helper.c +2 -0
@@ -1271,6 +1271,8 @@ static const struct dpcd_quirk dpcd_quirk_list[] = { { OUI(0x00, 0x10, 0xfa), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_NO_PSR) },/* CH7511 seems to leave SINK_COUNT zeroed */ { OUI(0x00, 0x00, 0x00), DEVICE_ID('C', 'H', '7', '5', '1', '1'), false, BIT(DP_DPCD_QUIRK_NO_SINK_COUNT) }, +/* Synaptics DP1.4 MST hubs can support DSC without virtual DPCD */ + { OUI(0x90, 0xCC, 0x24), DEVICE_ID_ANY, true, BIT(DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD) }, };#undef OUI
drivers/gpu/drm/drm_dp_mst_topology.c +27 -0
@@ -4222,6 +4222,7 @@ struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port) {struct drm_dp_mst_port *immediate_upstream_port;struct drm_dp_mst_port *fec_port; +struct drm_dp_desc desc = {0 };if (!port)return NULL ;
@@ -4274,6 +4275,32 @@ struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port)if (drm_dp_mst_is_virtual_dpcd (port))return &port->aux; +/* +* Synaptics quirk +* Applies to ports for which: +* - Physical aux has Synaptics OUI +* - DPv1.4 or higher +* - Port is on primary branch device +* - Not a VGA adapter (DP_DWN_STRM_PORT_TYPE_ANALOG) +*/ +if (!drm_dp_read_desc (port->mgr->aux, &desc, true)) +return NULL ; + +if (drm_dp_has_quirk (&desc,DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD ) && + port->mgr->dpcd[DP_DPCD_REV ] >=DP_DPCD_REV_14 && + port->parent == port->mgr->mst_primary) { +u8 downstreamport; + +if (drm_dp_dpcd_read (&port->aux,DP_DOWNSTREAMPORT_PRESENT , + &downstreamport,1 ) <0 ) +return NULL ; + +if ((downstreamport &DP_DWN_STRM_PORT_PRESENT ) && + ((downstreamport &DP_DWN_STRM_PORT_TYPE_MASK ) + !=DP_DWN_STRM_PORT_TYPE_ANALOG )) +return port->mgr->aux; + } +return NULL ; }EXPORT_SYMBOL (drm_dp_mst_dsc_aux_for_port);
include/drm/drm_dp_helper.h +7 -0
@@ -1464,6 +1464,13 @@ enum drm_dp_quirk {* The driver should ignore SINK_COUNT during detection. */ DP_DPCD_QUIRK_NO_SINK_COUNT , +/** +* @DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD: +* +* The device supports MST DSC despite not supporting Virtual DPCD. +* The DSC caps can be read from the physical aux instead. +*/ + DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD, };/**
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 7/17 drm/amd/display: Initialize DSC PPS variables to 0
In reply to a message not in the archiveFrom: David Francis <[email protected]>
For DSC MST, sometimes monitors would break out in full-screen static. The issue traced back to the PPS generation code, where these variables were being used uninitialized and were picking up garbage.
memset to 0 to avoid this
--- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +++ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +3 -0
@@ -526,6 +526,9 @@ bool dp_set_dsc_pps_sdp(struct pipe_ctx *pipe_ctx, bool enable)struct dsc_config dsc_cfg;uint8_t dsc_packed_pps[128 ]; +memset (&dsc_cfg,0 ,sizeof (dsc_cfg)); +memset (dsc_packed_pps,0 ,128 ); +/* Enable DSC hw block */ dsc_cfg.pic_width = stream->timing.h_addressable + stream->timing.h_border_left + stream->timing.h_border_right; dsc_cfg.pic_height = stream->timing.v_addressable + stream->timing.v_border_top + stream->timing.v_border_bottom;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c +3 -0
@@ -206,6 +206,9 @@ static bool dsc2_get_packed_pps(struct display_stream_compressor *dsc, const strstruct dsc_reg_values dsc_reg_vals;struct dsc_optc_config dsc_optc_cfg; +memset (&dsc_reg_vals,0 ,sizeof (dsc_reg_vals)); +memset (&dsc_optc_cfg,0 ,sizeof (dsc_optc_cfg)); +DC_LOG_DSC ("Getting packed DSC PPS for DSC Config:" );dsc_config_log (dsc, dsc_cfg);DC_LOG_DSC ("DSC Picture Parameter Set (PPS):" );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 8/17 drm/amd/display: Validate DSC caps on MST endpoints
In reply to a message not in the archiveFrom: David Francis <[email protected]>
During MST mode enumeration, if a new dc_sink is created, populate it with dsc caps as appropriate.
Use drm_dp_mst_dsc_aux_for_port to get the raw caps, then parse them onto dc_sink with dc_dsc_parse_dsc_dpcd.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 29 ++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +1 -0
@@ -323,6 +323,7 @@ struct amdgpu_dm_connector {struct drm_dp_mst_port *port;struct amdgpu_dm_connector *mst_port;struct amdgpu_encoder *mst_encoder; +struct drm_dp_aux *dsc_aux;/* TODO see if we can merge with ddc_bus or make a dm_connector */ struct amdgpu_i2c_adapter *i2c;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +28 -1
@@ -25,6 +25,7 @@#include <linux/version.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_dp_mst_helper.h> #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h"
@@ -196,6 +197,26 @@ static const struct drm_connector_funcs dm_dp_mst_connector_funcs = { .early_unregister = amdgpu_dm_mst_connector_early_unregister, }; +static bool validate_dsc_caps_on_connector (struct amdgpu_dm_connector *aconnector) +{ +struct dc_sink *dc_sink = aconnector->dc_sink; +struct drm_dp_mst_port *port = aconnector->port; +u8 dsc_caps[16 ] = {0 }; + + aconnector->dsc_aux =drm_dp_mst_dsc_aux_for_port (port); + +if (!aconnector->dsc_aux) +return false; + +if (drm_dp_dpcd_read (aconnector->dsc_aux,DP_DSC_SUPPORT , dsc_caps,16 ) <0 ) +return false; + +if (!dc_dsc_parse_dsc_dpcd (dsc_caps,NULL , &dc_sink->sink_dsc_caps.dsc_dec_caps)) +return false; + +return true; +} +static int dm_dp_mst_get_modes (struct drm_connector *connector) {struct amdgpu_dm_connector *aconnector =to_amdgpu_dm_connector (connector);
@@ -238,10 +259,16 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)/* dc_link_add_remote_sink returns a new reference */ aconnector->dc_sink = dc_sink; -if (aconnector->dc_sink) +if (aconnector->dc_sink) {amdgpu_dm_update_freesync_caps ( connector, aconnector->edid); +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT +if (!validate_dsc_caps_on_connector (aconnector)) +memset (&aconnector->dc_sink->sink_dsc_caps, +0 ,sizeof (aconnector->dc_sink->sink_dsc_caps)); +#endif + } } drm_connector_update_edid_property(
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 9/17 drm/amd/display: Write DSC enable to MST DPCD
In reply to a message not in the archiveFrom: David Francis <[email protected]>
Rework the dm_helpers_write_dsc_enable callback to handle the MST case.
Use the cached dsc_aux field.
--- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +18 -1
@@ -37,6 +37,7 @@#include "dc.h" #include "amdgpu_dm.h" #include "amdgpu_dm_irq.h" +#include "amdgpu_dm_mst_types.h" #include "dm_helpers.h"
@@ -516,8 +517,24 @@ bool dm_helpers_dp_write_dsc_enable( ) {uint8_t enable_dsc = enable ?1 :0 ; +struct amdgpu_dm_connector *aconnector; + +if (!stream) +return false; + +if (stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) { + aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; + +if (!aconnector->dsc_aux) +return false; + +return (drm_dp_dpcd_write (aconnector->dsc_aux,DP_DSC_ENABLE , &enable_dsc,1 ) >=0 ); + } + +if (stream->signal ==SIGNAL_TYPE_DISPLAY_PORT ) +return dm_helpers_dp_write_dpcd (ctx, stream->link,DP_DSC_ENABLE , &enable_dsc,1 ); -return dm_helpers_dp_write_dpcd (ctx, stream->sink->link,DP_DSC_ENABLE , &enable_dsc,1 ); +return false; }bool dm_helpers_is_dp_sink_present (struct dc_link *link)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 10/17 drm/dp_mst: Manually overwrite PBN divider for calculating timeslots
In reply to a message not in the archiveFrom: Mikita Lipski <[email protected]>
[why]
For DSC case we cannot always use topology manager's PBN divider variable. The default divider does not take FEC into account. Therefore we should allow driver to calculate its own divider based on the link rate and count its handling, as it is hw specific. [how]
Pass pbn_div as an argument, which will be used if its more than zero, otherwise default topology manager's pbn_div will be used.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- drivers/gpu/drm/drm_dp_mst_topology.c | 9 +++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ++- include/drm/drm_dp_mst_helper.h | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
@@ -4972,7 +4972,8 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, dm_new_connector_state->vcpi_slots =drm_dp_atomic_find_vcpi_slots (state, mst_mgr, mst_port, - dm_new_connector_state->pbn); + dm_new_connector_state->pbn, +0 );if (dm_new_connector_state->vcpi_slots <0 ) {DRM_DEBUG_ATOMIC ("failed finding vcpi slots: %d\n" , (int )dm_new_connector_state->vcpi_slots);return dm_new_connector_state->vcpi_slots;
drivers/gpu/drm/drm_dp_mst_topology.c +7 -2
@@ -3211,6 +3211,7 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,* @mgr: MST topology manager for the port * @port: port to find vcpi slots for * @pbn: bandwidth required for the mode in PBN +* @pbn_div: divider for DSC mode that takes FEC into account * * Allocates VCPI slots to @port, replacing any previous VCPI allocations it * may have had. Any atomic drivers which support MST must call this function
@@ -3237,7 +3238,8 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,*/ int drm_dp_atomic_find_vcpi_slots (struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, -struct drm_dp_mst_port *port,int pbn) +struct drm_dp_mst_port *port,int pbn, +int pbn_div) {struct drm_dp_mst_topology_state *topology_state;struct drm_dp_vcpi_allocation *pos, *vcpi =NULL ;
@@ -3270,7 +3272,10 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,if (!vcpi) prev_slots =0 ; - req_slots =DIV_ROUND_UP (pbn, mgr->pbn_div); +if (pbn_div <=0 ) + pbn_div = mgr->pbn_div; + + req_slots =DIV_ROUND_UP (pbn, pbn_div); DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] [MST PORT:%p] VCPI %d -> %d\n", port->connector->base.id, port->connector->name,
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
@@ -65,7 +65,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, false); slots =drm_dp_atomic_find_vcpi_slots (state, &intel_dp->mst_mgr, - port, crtc_state->pbn); + port, crtc_state->pbn,0 );if (slots == -EDEADLK )return slots;if (slots >=0 )
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
@@ -784,7 +784,8 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,if (crtc_state->mode_changed) { slots =drm_dp_atomic_find_vcpi_slots (state, &mstm->mgr, mstc->port, - asyh->dp.pbn); + asyh->dp.pbn, +0 );if (slots <0 )return slots;
include/drm/drm_dp_mst_helper.h +2 -1
@@ -661,7 +661,8 @@ struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_aint __must_check drm_dp_atomic_find_vcpi_slots (struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, -struct drm_dp_mst_port *port,int pbn); +struct drm_dp_mst_port *port,int pbn, +int pbn_div); int __must_check drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20191116220128.16598-11-mikita.lipski-5C7GfCeVMHo@public.gmane.org
Leo
Reviewed-by Leo LiRe: [PATCH v7 10/17] drm/dp_mst: Manually overwrite PBN divider for calculating timeslots
Quoted 101 lines · On 2019-11-16 5:01 p.m., [email protected] wrote:
From: Mikita Lipski <[email protected]>
[why]
For DSC case we cannot always use topology manager's PBN divider variable. The default divider does not take FEC into account. Therefore we should allow driver to calculate its own divider based on the link rate and count its handling, as it is hw specific. [how]
Passpbn_divas an argument, which will be used if its more than zero, otherwise default topology manager'spbn_divwill be used.Signed-off-by Mikita Lipski <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- drivers/gpu/drm/drm_dp_mst_topology.c | 9 +++++++-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ++- include/drm/drm_dp_mst_helper.h | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1@@ -4972,7 +4972,8 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, dm_new_connector_state->vcpi_slots =drm_dp_atomic_find_vcpi_slots (state, mst_mgr, mst_port, - dm_new_connector_state->pbn); + dm_new_connector_state->pbn, +0 );if (dm_new_connector_state->vcpi_slots <0 ) {DRM_DEBUG_ATOMIC ("failed finding vcpi slots: %d\n" , (int )dm_new_connector_state->vcpi_slots);return dm_new_connector_state->vcpi_slots;drivers/gpu/drm/drm_dp_mst_topology.c +7
-2@@ -3211,6 +3211,7 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,* @mgr: MST topology manager for the port * @port: port to find vcpi slots for * @pbn: bandwidth required for the mode in PBN +* @pbn_div: divider for DSC mode that takes FEC into account * * Allocates VCPI slots to @port, replacing any previous VCPI allocations it * may have had. Any atomic drivers which support MST must call this function @@ -3237,7 +3238,8 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,*/ int drm_dp_atomic_find_vcpi_slots (struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, -struct drm_dp_mst_port *port,int pbn) +struct drm_dp_mst_port *port,int pbn, +int pbn_div) {struct drm_dp_mst_topology_state *topology_state;struct drm_dp_vcpi_allocation *pos, *vcpi =NULL ;@@ -3270,7 +3272,10 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,if (!vcpi) prev_slots =0 ; - req_slots =DIV_ROUND_UP (pbn, mgr->pbn_div); +if (pbn_div <=0 ) + pbn_div = mgr->pbn_div; + + req_slots =DIV_ROUND_UP (pbn, pbn_div); DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] [MST PORT:%p] VCPI %d -> %d\n", port->connector->base.id, port->connector->name,drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1@@ -65,7 +65,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, false); slots =drm_dp_atomic_find_vcpi_slots (state, &intel_dp->mst_mgr, - port, crtc_state->pbn); + port, crtc_state->pbn,0 );if (slots == -EDEADLK )return slots;if (slots >=0 )drivers/gpu/drm/nouveau/dispnv50/disp.c +2
-1@@ -784,7 +784,8 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,if (crtc_state->mode_changed) { slots =drm_dp_atomic_find_vcpi_slots (state, &mstm->mgr, mstc->port, - asyh->dp.pbn); + asyh->dp.pbn, +0 );if (slots <0 )return slots;include/drm/drm_dp_mst_helper.h +0
-0
include/drm/drm_dp_mst_helper.h struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_a · line 668
Quoted 9 lines
include/drm/drm_dp_mst_helper.h +2
-1@@ -661,7 +661,8 @@ struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_aint __must_check drm_dp_atomic_find_vcpi_slots (struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, -struct drm_dp_mst_port *port,int pbn); +struct drm_dp_mst_port *port,int pbn, +int pbn_div); int __must_check drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 11/17 drm/dp_mst: Add DSC enablement helpers to DRM
In reply to a message not in the archiveFrom: Mikita Lipski <[email protected]>
Adding a helper function to be called by drivers outside of DRM to enable DSC on
the MST ports.
Function is called to recalculate VCPI allocation if DSC is enabled and raise the DSC flag to enable. In case of disabling DSC the flag is set to false and recalculation of VCPI slots is expected to be done in encoder's atomic_check.
v2: squash separate functions into one and call it per port
--- drivers/gpu/drm/drm_dp_mst_topology.c | 61 +++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 5 +++ 2 files changed, 66 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +61 -0
@@ -3876,6 +3876,67 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,return 0 ; } +/** +* drm_dp_mst_atomic_enable_dsc - Set DSC Enable Flag to On/Off +* @state: Pointer to the new drm_atomic_state +* @pointer: Pointer to the affected MST Port +* @pbn: Newly recalculated bw required for link with DSC enabled +* @pbn_div: Divider to calculate correct number of pbn per slot +* @enable: Boolean flag enabling or disabling DSC on the port +* +* This function enables DSC on the given Port +* by recalculating its vcpi from pbn provided +* and sets dsc_enable flag to keep track of which +* ports have DSC enabled +* +*/ +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable) +{ +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_vcpi_allocation *pos; +bool found = false; +int vcpi =0 ; + + mst_state =drm_atomic_get_mst_topology_state (state, port->mgr); + +if (IS_ERR (mst_state)) +return PTR_ERR (mst_state); + +list_for_each_entry (pos, &mst_state->vcpis, next) { +if (pos->port == port) { + found = true; +break ; + } + } + +if (!found) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Couldn't find VCPI allocation in mst state %p\n" , + port, mst_state); +return -EINVAL ; + } + +if (pos->dsc_enabled == enable) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] DSC flag is already set to %d, returning %d VCPI slots\n" , + port, enable, pos->vcpi); + vcpi = pos->vcpi; + } + +if (enable) { + vcpi =drm_dp_atomic_find_vcpi_slots (state, port->mgr, port, pbn, pbn_div); +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Enabling DSC flag, reallocating %d VCPI slots on the port\n" , + port, vcpi); +if (vcpi <0 ) +return -EINVAL ; + } + + pos->dsc_enabled = enable; + +return vcpi; +} +EXPORT_SYMBOL (drm_dp_mst_atomic_enable_dsc);/** * drm_dp_mst_atomic_check - Check that the new state of an MST topology in an * atomic update is valid
include/drm/drm_dp_mst_helper.h +5 -0
@@ -431,6 +431,7 @@ struct drm_dp_payload {struct drm_dp_vcpi_allocation {struct drm_dp_mst_port *port;int vcpi; +bool dsc_enabled;struct list_head next; };
@@ -663,6 +664,10 @@ drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn, int pbn_div); +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable); int __must_check drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20191116220128.16598-12-mikita.lipski-5C7GfCeVMHo@public.gmane.org
Re: [PATCH v7 11/17] drm/dp_mst: Add DSC enablement helpers to DRM
Quoted 28 lines · On 2019-11-16 5:01 p.m., [email protected] wrote:
From: Mikita Lipski <[email protected]>
Adding a helper function to be called by drivers outside of DRM to enable DSC on
the MST ports.Function is called to recalculate VCPI allocation if DSC is enabled and raise the DSC flag to enable. In case of disabling DSC the flag is set to false and recalculation of VCPI slots is expected to be done in encoder's
atomic_check.v2: squash separate functions into one and call it per port
Cc Harry Wentland <[email protected]>Cc Lyude Paul <[email protected]>Signed-off-by Mikita Lipski <[email protected]>--- drivers/gpu/drm/drm_dp_mst_topology.c | 61 +++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 5 +++ 2 files changed, 66 insertions(+)drivers/gpu/drm/drm_dp_mst_topology.c +0
-0
drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3882
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0@@ -3876,6 +3876,67 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,return 0 ; } +/** +* drm_dp_mst_atomic_enable_dsc - Set DSC Enable Flag to On/Off +* @state: Pointer to the new drm_atomic_state +* @pointer: Pointer to the affected MST Port
s/@pointer/@port/
drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3890
Quoted 8 lines
drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+* @pbn: Newly recalculated bw required for link with DSC enabled +* @pbn_div: Divider to calculate correct number of pbn per slot +* @enable: Boolean flag enabling or disabling DSC on the port +* +* This function enables DSC on the given Port +* by recalculating its vcpi from pbn provided +* and sets dsc_enable flag to keep track of which +* ports have DSC enabled
Would be good to document the return value as well.
Quoted 24 lines
drivers/gpu/drm/drm_dp_mst_topology.c +24
-0+* +*/ +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable) +{ +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_vcpi_allocation *pos; +bool found = false; +int vcpi =0 ; + + mst_state =drm_atomic_get_mst_topology_state (state, port->mgr); + +if (IS_ERR (mst_state)) +return PTR_ERR (mst_state); + +list_for_each_entry (pos, &mst_state->vcpis, next) { +if (pos->port == port) { + found = true; +break ; + } + } +
drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3924
Quoted 10 lines
drivers/gpu/drm/drm_dp_mst_topology.c +10
-0+if (!found) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Couldn't find VCPI allocation in mst state %p\n" , + port, mst_state); +return -EINVAL ; + } + +if (pos->dsc_enabled == enable) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] DSC flag is already set to %d, returning %d VCPI slots\n" , + port, enable, pos->vcpi); + vcpi = pos->vcpi;
Do we want to early return here?
- Leo
Quoted 32 lines
drivers/gpu/drm/drm_dp_mst_topology.c +15
-0+ } + +if (enable) { + vcpi =drm_dp_atomic_find_vcpi_slots (state, port->mgr, port, pbn, pbn_div); +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Enabling DSC flag, reallocating %d VCPI slots on the port\n" , + port, vcpi); +if (vcpi <0 ) +return -EINVAL ; + } + + pos->dsc_enabled = enable; + +return vcpi; +} +EXPORT_SYMBOL (drm_dp_mst_atomic_enable_dsc);/** * drm_dp_mst_atomic_check - Check that the new state of an MST topology in an * atomic update is valid include/drm/drm_dp_mst_helper.h +1
-0@@ -431,6 +431,7 @@ struct drm_dp_payload {struct drm_dp_vcpi_allocation {struct drm_dp_mst_port *port;int vcpi; +bool dsc_enabled;struct list_head next; };
include/drm/drm_dp_mst_helper.h drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, · line 673
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +4
-0@@ -663,6 +664,10 @@ drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn, int pbn_div); +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable); int __must_check drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): fe56a601-777d-f8db-c229-f155a162f100-5C7GfCeVMHo@public.gmane.org
Re: [PATCH v7 11/17] drm/dp_mst: Add DSC enablement helpers to DRM
Just realized Lyude wasn't CC'd originally, and I forgot to CC everyone as well in the reply :)
Leo
Quoted 121 lines · Leo
Quoted 28 lines · On 2019-11-16 5:01 p.m., [email protected] wrote:
From: Mikita Lipski <[email protected]>
Adding a helper function to be called by drivers outside of DRM to enable DSC on
the MST ports.Function is called to recalculate VCPI allocation if DSC is enabled and raise the DSC flag to enable. In case of disabling DSC the flag is set to false and recalculation of VCPI slots is expected to be done in encoder's
atomic_check.v2: squash separate functions into one and call it per port
Cc Harry Wentland <[email protected]>Cc Lyude Paul <[email protected]>Signed-off-by Mikita Lipski <[email protected]>--- drivers/gpu/drm/drm_dp_mst_topology.c | 61 +++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 5 +++ 2 files changed, 66 insertions(+)drivers/gpu/drm/drm_dp_mst_topology.c +0
-0drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3882
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0@@ -3876,6 +3876,67 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,return 0 ; } +/** +* drm_dp_mst_atomic_enable_dsc - Set DSC Enable Flag to On/Off +* @state: Pointer to the new drm_atomic_state +* @pointer: Pointer to the affected MST Port s/@pointer/@port/
drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3890
Quoted 8 lines
drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+* @pbn: Newly recalculated bw required for link with DSC enabled +* @pbn_div: Divider to calculate correct number of pbn per slot +* @enable: Boolean flag enabling or disabling DSC on the port +* +* This function enables DSC on the given Port +* by recalculating its vcpi from pbn provided +* and sets dsc_enable flag to keep track of which +* ports have DSC enabled Would be good to document the return value as well.
Quoted 24 lines
drivers/gpu/drm/drm_dp_mst_topology.c +24
-0+* +*/ +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable) +{ +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_vcpi_allocation *pos; +bool found = false; +int vcpi =0 ; + + mst_state =drm_atomic_get_mst_topology_state (state, port->mgr); + +if (IS_ERR (mst_state)) +return PTR_ERR (mst_state); + +list_for_each_entry (pos, &mst_state->vcpis, next) { +if (pos->port == port) { + found = true; +break ; + } + } +drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3924
Quoted 10 lines
drivers/gpu/drm/drm_dp_mst_topology.c +10
-0+if (!found) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Couldn't find VCPI allocation in mst state %p\n" , + port, mst_state); +return -EINVAL ; + } + +if (pos->dsc_enabled == enable) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] DSC flag is already set to %d, returning %d VCPI slots\n" , + port, enable, pos->vcpi); + vcpi = pos->vcpi;Do we want to early return here?
- Leo
Quoted 30 lines
drivers/gpu/drm/drm_dp_mst_topology.c +15
-0+ } + +if (enable) { + vcpi =drm_dp_atomic_find_vcpi_slots (state, port->mgr, port, pbn, pbn_div); +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Enabling DSC flag, reallocating %d VCPI slots on the port\n" , + port, vcpi); +if (vcpi <0 ) +return -EINVAL ; + } + + pos->dsc_enabled = enable; + +return vcpi; +} +EXPORT_SYMBOL (drm_dp_mst_atomic_enable_dsc);/** * drm_dp_mst_atomic_check - Check that the new state of an MST topology in an * atomic update is valid include/drm/drm_dp_mst_helper.h +1
-0@@ -431,6 +431,7 @@ struct drm_dp_payload {struct drm_dp_vcpi_allocation {struct drm_dp_mst_port *port;int vcpi; +bool dsc_enabled;struct list_head next; };
Quoted 17 lines
include/drm/drm_dp_mst_helper.h drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, · line 673
Quoted 12 lines
include/drm/drm_dp_mst_helper.h +4
-0@@ -663,6 +664,10 @@ drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn, int pbn_div); +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable); int __must_check drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr,_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Csunpeng.li%40amd.com%7C192110186aa94fd013bf08d77284c044%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637103786829935834&sdata=qKqFNy9eXf%2FuvDcHD4Vlx9i5u2wh14KflewjrrqC544%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH v7 11/17] drm/dp_mst: Add DSC enablement helpers to DRM
In reply to a message not in the archiveQuoted 34 lines · Leo
Quoted 31 lines · On 2019-11-16 5:01 p.m., [email protected] wrote:
From: Mikita Lipski <[email protected]>
Adding a helper function to be called by drivers outside of DRM to enable DSC on
the MST ports.Function is called to recalculate VCPI allocation if DSC is enabled and raise the DSC flag to enable. In case of disabling DSC the flag is set to false and recalculation of VCPI slots is expected to be done in encoder's
atomic_check.v2: squash separate functions into one and call it per port
Cc Harry Wentland <[email protected]>Cc Lyude Paul <[email protected]>Signed-off-by Mikita Lipski <[email protected]>--- drivers/gpu/drm/drm_dp_mst_topology.c | 61 +++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 5 +++ 2 files changed, 66 insertions(+)drivers/gpu/drm/drm_dp_mst_topology.c +0
-0@@ -3876,6 +3876,67 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,return 0 ; }
Quoted 7 lines
drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3882
Quoted 4 lines
drivers/gpu/drm/drm_dp_mst_topology.c +4
-0+/** +* drm_dp_mst_atomic_enable_dsc - Set DSC Enable Flag to On/Off +* @state: Pointer to the new drm_atomic_state +* @pointer: Pointer to the affected MST Port s/@pointer/@port/
Thanks,
will update the comment.
Quoted 39 lines
drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3890
Quoted 8 lines
drivers/gpu/drm/drm_dp_mst_topology.c +8
-0+* @pbn: Newly recalculated bw required for link with DSC enabled +* @pbn_div: Divider to calculate correct number of pbn per slot +* @enable: Boolean flag enabling or disabling DSC on the port +* +* This function enables DSC on the given Port +* by recalculating its vcpi from pbn provided +* and sets dsc_enable flag to keep track of which +* ports have DSC enabled Would be good to document the return value as well.
Quoted 28 lines
drivers/gpu/drm/drm_dp_mst_topology.c +28
-0+* +*/ +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable) +{ +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_vcpi_allocation *pos; +bool found = false; +int vcpi =0 ; + + mst_state =drm_atomic_get_mst_topology_state (state, port->mgr); + +if (IS_ERR (mst_state)) +return PTR_ERR (mst_state); + +list_for_each_entry (pos, &mst_state->vcpis, next) { +if (pos->port == port) { + found = true; +break ; + } + } + +if (!found) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Couldn't find VCPI allocation in mst state %p\n" , + port, mst_state); +return -EINVAL ;
Quoted 9 lines
drivers/gpu/drm/drm_dp_mst_topology.c drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr, · line 3924
Quoted 6 lines
drivers/gpu/drm/drm_dp_mst_topology.c +6
-0+ } + +if (pos->dsc_enabled == enable) { +DRM_DEBUG_ATOMIC ("[MST PORT:%p] DSC flag is already set to %d, returning %d VCPI slots\n" , + port, enable, pos->vcpi); + vcpi = pos->vcpi;Do we want to early return here?
Not if a new compression rate is set.
The DSC could still be enabled, but the new device is introduced - higher compression will be required, so PBN will change and we will have to reassign the slots to the port.
Quoted 49 lines
- Leo
Quoted 32 lines
drivers/gpu/drm/drm_dp_mst_topology.c +15
-0+ } + +if (enable) { + vcpi =drm_dp_atomic_find_vcpi_slots (state, port->mgr, port, pbn, pbn_div); +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Enabling DSC flag, reallocating %d VCPI slots on the port\n" , + port, vcpi); +if (vcpi <0 ) +return -EINVAL ; + } + + pos->dsc_enabled = enable; + +return vcpi; +} +EXPORT_SYMBOL (drm_dp_mst_atomic_enable_dsc);/** * drm_dp_mst_atomic_check - Check that the new state of an MST topology in an * atomic update is valid include/drm/drm_dp_mst_helper.h +1
-0@@ -431,6 +431,7 @@ struct drm_dp_payload {struct drm_dp_vcpi_allocation {struct drm_dp_mst_port *port;int vcpi; +bool dsc_enabled;struct list_head next; };include/drm/drm_dp_mst_helper.h drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, · line 673
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +4
-0@@ -663,6 +664,10 @@ drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn, int pbn_div); +int drm_dp_mst_atomic_enable_dsc (struct drm_atomic_state *state, +struct drm_dp_mst_port *port, +int pbn,int pbn_div, +bool enable); int __must_check drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr,_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cmikita.lipski%40amd.com%7C192110186aa94fd013bf08d77284c044%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637103786818615385&sdata=clMrVjoD6aPWzkVyxr%2FDEslGZmTrA2fx3vFp9ODKFu4%3D&reserved=0
Signature · 8 lines
Thanks, Mikita Lipski Software Engineer, AMD [email protected] _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 12/17 drm/dp_mst: Add branch bandwidth validation to MST atomic check
In reply to a message not in the archiveFrom: Mikita Lipski <[email protected]>
Adding PBN attribute to drm_dp_vcpi_allocation structure to keep track of how much bandwidth each Port requires. Adding drm_dp_mst_atomic_check_bw_limit to verify that state's bandwidth needs doesn't exceed available bandwidth. The funtion is called in drm_dp_mst_atomic_check after drm_dp_mst_atomic_check_topology_state to fully verify that the proposed topology is supported.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 67 ++++++++++++++++++++++++++- include/drm/drm_dp_mst_helper.h | 1 + 2 files changed, 66 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +65 -2
@@ -3243,7 +3243,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, {struct drm_dp_mst_topology_state *topology_state;struct drm_dp_vcpi_allocation *pos, *vcpi =NULL ; -int prev_slots, req_slots, ret; +int prev_slots, prev_bw, req_slots, ret; topology_state =drm_atomic_get_mst_topology_state (state, mgr);if (IS_ERR (topology_state))
@@ -3254,6 +3254,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,if (pos->port == port) { vcpi = pos; prev_slots = vcpi->vcpi; + prev_bw = vcpi->pbn;/* * This should never happen, unless the driver tries
@@ -3269,8 +3270,10 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,break ; } } -if (!vcpi) +if (!vcpi) { prev_slots =0 ; + prev_bw =0 ; + }if (pbn_div <=0 ) pbn_div = mgr->pbn_div;
@@ -3280,6 +3283,9 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] [MST PORT:%p] VCPI %d -> %d\n" , port->connector->base.id, port->connector->name, port, prev_slots, req_slots); +DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] [MST PORT:%p] PBN %d -> %d\n" , + port->connector->base.id, port->connector->name, + port, prev_bw, pbn);/* Add the new allocation to the state */ if (!vcpi) {
@@ -3292,6 +3298,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,list_add (&vcpi->next, &topology_state->vcpis); } vcpi->vcpi = req_slots; + vcpi->pbn = pbn; ret = req_slots;return ret;
@@ -3837,6 +3844,59 @@ static void drm_dp_mst_destroy_state(struct drm_private_obj *obj,kfree (mst_state); } +static bool drm_dp_mst_port_downstream_of_branch (struct drm_dp_mst_port *port, +struct drm_dp_mst_branch *branch) +{ +while (port->parent) { +if (port->parent == branch) +return true; + +if (port->parent->port_parent) + port = port->parent->port_parent; +else +break ; + } +return false; +} + +static inline +int drm_dp_mst_atomic_check_bw_limit (struct drm_dp_mst_branch *branch, +struct drm_dp_mst_topology_state *mst_state) +{ +struct drm_dp_mst_port *port; +struct drm_dp_vcpi_allocation *vcpi; +int pbn_limit =0 , pbn_used =0 ; + +list_for_each_entry (port, &branch->ports, next) { +if (port->mstb) { +if (drm_dp_mst_atomic_check_bw_limit (port->mstb, mst_state)) +return -EINVAL ; + } +if (port->available_pbn >0 ) + pbn_limit = port->available_pbn; + } +DRM_DEBUG_ATOMIC ("[MST BRANCH:%p] branch has %d PBN available\n" , + branch, + pbn_limit); + +list_for_each_entry (vcpi, &mst_state->vcpis, next) { +if (!vcpi->pbn) +continue ; + +if (drm_dp_mst_port_downstream_of_branch (vcpi->port, branch)) + pbn_used += vcpi->pbn; + } +DRM_DEBUG_ATOMIC ("[MST BRANCH:%p] branch used %d PBN\n" , + branch, + pbn_used); +if (pbn_used > pbn_limit) { +DRM_DEBUG_ATOMIC ("[MST BRANCH:%p] No available bandwidth\n" , + branch); +return -EINVAL ; + } +return 0 ; +} +static inline int drm_dp_mst_atomic_check_topology_state (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_topology_state *mst_state)
@@ -3968,6 +4028,9 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state) ret =drm_dp_mst_atomic_check_topology_state (mgr, mst_state);if (ret)break ; + ret =drm_dp_mst_atomic_check_bw_limit (mgr->mst_primary, mst_state); +if (ret) +break ; }return ret;
include/drm/drm_dp_mst_helper.h +1 -0
@@ -431,6 +431,7 @@ struct drm_dp_payload {struct drm_dp_vcpi_allocation {struct drm_dp_mst_port *port;int vcpi; +int pbn;bool dsc_enabled;struct list_head next; };
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20191116220128.16598-13-mikita.lipski-5C7GfCeVMHo@public.gmane.org
Re: [PATCH v7 12/17] drm/dp_mst: Add branch bandwidth validation to MST atomic check
I'm not well versed in MST bw validation, which might explain my confusion here - so bear with me :)
...
Quoted 94 lines · On 2019-11-16 5:01 p.m., [email protected] wrote:
From: Mikita Lipski <[email protected]>
Adding PBN attribute to
drm_dp_vcpi_allocationstructure to keep track of how much bandwidth each Port requires. Addingdrm_dp_mst_atomic_check_bw_limitto verify that state's bandwidth needs doesn't exceed available bandwidth. The funtion is called indrm_dp_mst_atomic_checkafterdrm_dp_mst_atomic_check_topology_stateto fully verify that the proposed topology is supported.Cc Jerry Zuo <[email protected]>Cc Harry Wentland <[email protected]>Cc Lyude Paul <[email protected]>Signed-off-by Mikita Lipski <[email protected]>--- drivers/gpu/drm/drm_dp_mst_topology.c | 67 ++++++++++++++++++++++++++- include/drm/drm_dp_mst_helper.h | 1 + 2 files changed, 66 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +29
-2@@ -3243,7 +3243,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, {struct drm_dp_mst_topology_state *topology_state;struct drm_dp_vcpi_allocation *pos, *vcpi =NULL ; -int prev_slots, req_slots, ret; +int prev_slots, prev_bw, req_slots, ret; topology_state =drm_atomic_get_mst_topology_state (state, mgr);if (IS_ERR (topology_state))@@ -3254,6 +3254,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,if (pos->port == port) { vcpi = pos; prev_slots = vcpi->vcpi; + prev_bw = vcpi->pbn;/* * This should never happen, unless the driver tries @@ -3269,8 +3270,10 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,break ; } } -if (!vcpi) +if (!vcpi) { prev_slots =0 ; + prev_bw =0 ; + }if (pbn_div <=0 ) pbn_div = mgr->pbn_div;@@ -3280,6 +3283,9 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] [MST PORT:%p] VCPI %d -> %d\n" , port->connector->base.id, port->connector->name, port, prev_slots, req_slots); +DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] [MST PORT:%p] PBN %d -> %d\n" , + port->connector->base.id, port->connector->name, + port, prev_bw, pbn);/* Add the new allocation to the state */ if (!vcpi) {@@ -3292,6 +3298,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,list_add (&vcpi->next, &topology_state->vcpis); } vcpi->vcpi = req_slots; + vcpi->pbn = pbn; ret = req_slots;return ret;@@ -3837,6 +3844,59 @@ static void drm_dp_mst_destroy_state(struct drm_private_obj *obj,kfree (mst_state); } +static bool drm_dp_mst_port_downstream_of_branch (struct drm_dp_mst_port *port, +struct drm_dp_mst_branch *branch) +{ +while (port->parent) { +if (port->parent == branch) +return true; + +if (port->parent->port_parent) + port = port->parent->port_parent; +else +break ; + } +return false; +} + +static inline +int drm_dp_mst_atomic_check_bw_limit (struct drm_dp_mst_branch *branch, +struct drm_dp_mst_topology_state *mst_state) +{ +struct drm_dp_mst_port *port;
drivers/gpu/drm/drm_dp_mst_topology.c static void drm_dp_mst_destroy_state(struct drm_private_obj *obj, · line 3876
Quoted 10 lines
drivers/gpu/drm/drm_dp_mst_topology.c +10
-0+struct drm_dp_vcpi_allocation *vcpi; +int pbn_limit =0 , pbn_used =0 ; + +list_for_each_entry (port, &branch->ports, next) { +if (port->mstb) { +if (drm_dp_mst_atomic_check_bw_limit (port->mstb, mst_state)) +return -EINVAL ; + } +if (port->available_pbn >0 ) + pbn_limit = port->available_pbn;
Shouldn't the pbn_limit be the pbn limit of *this* mstb's upstream port (branch->port_parent) and not the downstream ports? Otherwise, wouldn't this mean we're only considering the 'last' downstream port in this mstb when saving the pbn_limit? (or perhapse you meant to use '+=' rather than '=')
drivers/gpu/drm/drm_dp_mst_topology.c static void drm_dp_mst_destroy_state(struct drm_private_obj *obj, · line 3888
Quoted 12 lines
drivers/gpu/drm/drm_dp_mst_topology.c +12
-0+ } +DRM_DEBUG_ATOMIC ("[MST BRANCH:%p] branch has %d PBN available\n" , + branch, + pbn_limit); + +list_for_each_entry (vcpi, &mst_state->vcpis, next) { +if (!vcpi->pbn) +continue ; + +if (drm_dp_mst_port_downstream_of_branch (vcpi->port, branch)) + pbn_used += vcpi->pbn; + }
It's not clear to me how this will behave when recursively called.
The above iteration over branch->ports looks to be checking that a downstream MSTB is bandwidth-valid. Wouldn't this iteration here repeat the validation work again, since drm_dp_mst_port_downstream_of_branch() will return true for *all* downstream ports (including the ones we recursed on above)? It wouldn't be wrong exactly, but not sure if that's intended.
Thanks,
Leo
Quoted 30 lines
drivers/gpu/drm/drm_dp_mst_topology.c +14
-0+DRM_DEBUG_ATOMIC ("[MST BRANCH:%p] branch used %d PBN\n" , + branch, + pbn_used); +if (pbn_used > pbn_limit) { +DRM_DEBUG_ATOMIC ("[MST BRANCH:%p] No available bandwidth\n" , + branch); +return -EINVAL ; + } +return 0 ; +} +static inline int drm_dp_mst_atomic_check_topology_state (struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_topology_state *mst_state)@@ -3968,6 +4028,9 @@ int drm_dp_mst_atomic_check(struct drm_atomic_state *state) ret =drm_dp_mst_atomic_check_topology_state (mgr, mst_state);if (ret)break ; + ret =drm_dp_mst_atomic_check_bw_limit (mgr->mst_primary, mst_state); +if (ret) +break ; }return ret;include/drm/drm_dp_mst_helper.h +0
-0
include/drm/drm_dp_mst_helper.h struct drm_dp_payload { · line 437
Quoted 7 lines
include/drm/drm_dp_mst_helper.h +1
-0@@ -431,6 +431,7 @@ struct drm_dp_payload {struct drm_dp_vcpi_allocation {struct drm_dp_mst_port *port;int vcpi; +int pbn;bool dsc_enabled;struct list_head next; };
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 13/17 drm/dp_mst: Add helper to trigger modeset on affected DSC MST CRTCs
In reply to a message not in the archiveFrom: Mikita Lipski <[email protected]>
[why]
Whenever a connector on an MST network is changed or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing.
[how]
Adding helper to trigger modesets on MST DSC connectors by setting mode_changed flag on CRTCs in the same topology as affected connector
--- drivers/gpu/drm/drm_dp_mst_topology.c | 90 +++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 2 + 2 files changed, 92 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +90 -0
@@ -73,6 +73,7 @@ static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr,static int drm_dp_mst_register_i2c_bus (struct drm_dp_aux *aux);static void drm_dp_mst_unregister_i2c_bus (struct drm_dp_aux *aux);static void drm_dp_mst_kick_tx (struct drm_dp_mst_topology_mgr *mgr); +static bool drm_dp_mst_is_dsc_supported (struct drm_dp_mst_port *port);#define DP_STR (x) [DP_ ## x] = #x
@@ -3936,6 +3937,66 @@ drm_dp_mst_atomic_check_topology_state(struct drm_dp_mst_topology_mgr *mgr,return 0 ; } +/** +* drm_dp_mst_add_affected_dsc_crtcs +* @state: Pointer to the new &struct drm_dp_mst_topology_state +* @port: Pointer tothe port of connector with new state +* +* Whenever there is a change in mst topology +* DSC configuration would have to be recalculated +* therefore we need to trigger modeset on all affected +* CRTCs in that topology +* +* See also: +* drm_dp_mst_atomic_enable_dsc() +*/ +int drm_dp_mst_add_affected_dsc_crtcs (struct drm_atomic_state *state,struct drm_dp_mst_port *port) +{ +struct drm_dp_mst_topology_state *mst_state; +struct drm_dp_vcpi_allocation *pos; +struct drm_connector *connector; +struct drm_connector_state *conn_state; +struct drm_crtc *crtc; +struct drm_crtc_state *crtc_state; + +if (!port) +return -EINVAL ; + + mst_state =drm_atomic_get_mst_topology_state (state, port->mgr); + +list_for_each_entry (pos, &mst_state->vcpis, next) { + + connector = pos->port->connector; + +if (!connector) +return -EINVAL ; + + conn_state =drm_atomic_get_connector_state (state, connector); + +if (IS_ERR (conn_state)) +return PTR_ERR (conn_state); + + crtc = conn_state->crtc; + +if (!crtc) +return -EINVAL ; + +if (!drm_dp_mst_is_dsc_supported (pos->port)) +continue ; + + crtc_state =drm_atomic_get_crtc_state (mst_state->base.state, crtc); + +if (IS_ERR (crtc_state)) +return PTR_ERR (crtc_state); + +DRM_DEBUG_ATOMIC ("[MST PORT:%p] Setting mode_changed flag on CRTC %p\n" , port, crtc); + + crtc_state->mode_changed = true; + } +return 0 ; +} +EXPORT_SYMBOL (drm_dp_mst_add_affected_dsc_crtcs); +/** * drm_dp_mst_atomic_enable_dsc - Set DSC Enable Flag to On/Off * @state: Pointer to the new drm_atomic_state
@@ -4433,3 +4494,32 @@ struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port)return NULL ; }EXPORT_SYMBOL (drm_dp_mst_dsc_aux_for_port); + +/** +* drm_dp_mst_is_dsc_supported() - Verify DSC support on connector +* @port: The port to check. A leaf of the MST tree with an attached display. +* +* Acquiring correct aux from drm_dp_mst_dsc_aux_for_port +* and verifying DPCD flag that the aux is DSC capable +* +* Returns: +* True / False - if DSC is supported +*/ +static bool drm_dp_mst_is_dsc_supported (struct drm_dp_mst_port *port) +{ +struct drm_dp_aux *dsc_aux; +u8 endpoint_dsc; + + dsc_aux =drm_dp_mst_dsc_aux_for_port (port); + +if (!dsc_aux) +return false; + +if (drm_dp_dpcd_read (&port->aux,DP_DSC_SUPPORT , &endpoint_dsc,1 ) <0 ) +return false; + +if (endpoint_dsc &DP_DSC_DECOMPRESSION_IS_SUPPORTED ) +return true; + +return false; +}
include/drm/drm_dp_mst_helper.h +2 -0
@@ -669,6 +669,8 @@ int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state,struct drm_dp_mst_port *port, int pbn, int pbn_div, bool enable); +int drm_dp_mst_add_affected_dsc_crtcs (struct drm_atomic_state *state, +struct drm_dp_mst_port *port); int __must_check drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 14/17 drm/amd/display: Add PBN per slot calculation for DSC
In reply to a message not in the archiveFrom: Mikita Lipski <[email protected]>
[why]
Need to calculate VCPI slots differently for DSC
to take in account current link rate, link count
and FEC.
[how]
Add helper to get pbn_div from dc_link
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 8 ++++++++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 2 ++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +8 -0
@@ -497,3 +497,11 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, aconnector->connector_id); } +int dm_mst_get_pbn_divider (struct dc_link *link) +{ +if (!link) +return 0 ; + +return dc_link_bandwidth_kbps (link, +dc_link_get_link_cap (link)) / (8 *1000 *54 ); +}
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +2 -0
@@ -29,6 +29,8 @@struct amdgpu_display_manager ;struct amdgpu_dm_connector ; +int dm_mst_get_pbn_divider (struct dc_link *link); +void amdgpu_dm_initialize_dp_connector (struct amdgpu_display_manager *dm,struct amdgpu_dm_connector *aconnector);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v7 5/17 drm/dp_mst: Add helpers for MST DSC and virtual DPCD aux
In reply to [email protected]From: David Francis <[email protected]>
Add drm_dp_mst_dsc_aux_for_port. To enable DSC, the DSC_ENABLED register might have to be written on the leaf port's DPCD, its parent's DPCD, or the MST manager's DPCD. This function finds the correct aux for the job.
As part of this, add drm_dp_mst_is_virtual_dpcd. Virtual DPCD is a DP feature new in DP v1.4, which exposes certain DPCD registers on virtual ports.
v2: Remember to unlock mutex on all paths
v3: Refactor to match coding style and increase brevity
--- drivers/gpu/drm/drm_dp_mst_topology.c | 127 ++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 2 + 2 files changed, 129 insertions(+)
drivers/gpu/drm/drm_dp_mst_topology.c +127 -0
@@ -4150,3 +4150,130 @@ static void drm_dp_mst_unregister_i2c_bus(struct drm_dp_aux *aux) {i2c_del_adapter (&aux->ddc); } + +/** +* drm_dp_mst_is_virtual_dpcd() - Is the given port a virtual DP Peer Device +* @port: The port to check +* +* A single physical MST hub object can be represented in the topology +* by multiple branches, with virtual ports between those branches. +* +* As of DP1.4, An MST hub with internal (virtual) ports must expose +* certain DPCD registers over those ports. See sections 2.6.1.1.1 +* and 2.6.1.1.2 of Display Port specification v1.4 for details. +* +* May acquire mgr->lock +* +* Returns: +* true if the port is a virtual DP peer device, false otherwise +*/ +static bool drm_dp_mst_is_virtual_dpcd (struct drm_dp_mst_port *port) +{ +struct drm_dp_mst_port *downstream_port; + +if (!port || port->dpcd_rev <DP_DPCD_REV_14 ) +return false; + +/* Virtual DP Sink (Internal Display Panel) */ +if (port->port_num >=8 ) +return true; + +/* DP-to-HDMI Protocol Converter */ +if (port->pdt ==DP_PEER_DEVICE_DP_LEGACY_CONV && + !port->mcs && + port->ldps) +return true; + +/* DP-to-DP */ +mutex_lock (&port->mgr->lock); +if (port->pdt ==DP_PEER_DEVICE_MST_BRANCHING && + port->mstb && + port->mstb->num_ports ==2 ) { +list_for_each_entry (downstream_port, &port->mstb->ports, next) { +if (downstream_port->pdt ==DP_PEER_DEVICE_SST_SINK && + !downstream_port->input) { +mutex_unlock (&port->mgr->lock); +return true; + } + } + } +mutex_unlock (&port->mgr->lock); + +return false; +} + +/** +* drm_dp_mst_dsc_aux_for_port() - Find the correct aux for DSC +* @port: The port to check. A leaf of the MST tree with an attached display. +* +* Depending on the situation, DSC may be enabled via the endpoint aux, +* the immediately upstream aux, or the connector's physical aux. +* +* This is both the correct aux to read DSC_CAPABILITY and the +* correct aux to write DSC_ENABLED. +* +* This operation can be expensive (up to four aux reads), so +* the caller should cache the return. +* +* Returns: +* NULL if DSC cannot be enabled on this port, otherwise the aux device +*/ +struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port (struct drm_dp_mst_port *port) +{ +struct drm_dp_mst_port *immediate_upstream_port; +struct drm_dp_mst_port *fec_port; + +if (!port) +return NULL ; + +if (port->parent) + immediate_upstream_port = port->parent->port_parent; +else + immediate_upstream_port =NULL ; + + fec_port = immediate_upstream_port; +while (fec_port) { +/* +* Each physical link (i.e. not a virtual port) between the +* output and the primary device must support FEC +*/ +if (!drm_dp_mst_is_virtual_dpcd (fec_port) && + !fec_port->fec_capable) +return NULL ; + + fec_port = fec_port->parent->port_parent; + } + +/* DP-to-DP peer device */ +if (drm_dp_mst_is_virtual_dpcd (immediate_upstream_port)) { +u8 upstream_dsc; +u8 endpoint_dsc; +u8 endpoint_fec; + +if (drm_dp_dpcd_read (&port->aux, +DP_DSC_SUPPORT , &endpoint_dsc,1 ) <0 ) +return NULL ; +if (drm_dp_dpcd_read (&port->aux, +DP_FEC_CAPABILITY , &endpoint_fec,1 ) <0 ) +return NULL ; +if (drm_dp_dpcd_read (&immediate_upstream_port->aux, +DP_DSC_SUPPORT , &upstream_dsc,1 ) <0 ) +return NULL ; + +/* Enpoint decompression with DP-to-DP peer device */ +if ((endpoint_dsc &DP_DSC_DECOMPRESSION_IS_SUPPORTED ) && + (endpoint_fec &DP_FEC_CAPABLE ) && + (upstream_dsc &0x2 )/* DSC passthrough */ ) +return &port->aux; + +/* Virtual DPCD decompression with DP-to-DP peer device */ +return &immediate_upstream_port->aux; + } + +/* Virtual DPCD decompression with DP-to-HDMI or Virtual DP Sink */ +if (drm_dp_mst_is_virtual_dpcd (port)) +return &port->aux; + +return NULL ; +} +EXPORT_SYMBOL (drm_dp_mst_dsc_aux_for_port);
include/drm/drm_dp_mst_helper.h +2 -0
@@ -673,6 +673,8 @@ int __must_check drm_dp_mst_atomic_check(struct drm_atomic_state *state);void drm_dp_mst_get_port_malloc (struct drm_dp_mst_port *port);void drm_dp_mst_put_port_malloc (struct drm_dp_mst_port *port); +struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port (struct drm_dp_mst_port *port); +extern const struct drm_private_state_funcs drm_dp_mst_topology_state_funcs;/**
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 15/17 drm/amd/display: MST DSC compute fair share
In reply to [email protected]From: David Francis <[email protected]>
If there is limited link bandwidth on a MST network, it must be divided fairly between the streams on that network
Implement an algorithm to determine the correct DSC config for each stream
The algorithm:
This
[ ] ( )
represents the range of bandwidths possible for a given stream. The [] area represents the range of DSC configs, and the () represents no DSC. The bandwidth used increases from left to right.
First, try disabling DSC on all streams
[ ] (|)
[ ] (|)
Check this against the bandwidth limits of the link and each branch (including each endpoint). If it passes, the job is done
Second, try maximum DSC compression on all streams that support DSC
[| ] ( )
[| ] ( )
If this does not pass, then enabling this combination of streams is impossible
Otherwise, divide the remaining bandwidth evenly amongst the streams
[ | ] ( )
[ | ] ( )
If one or more of the streams reach minimum compression, evenly divide the reamining bandwidth amongst the remaining streams
[ |] ( )
[ |] ( )
[ | ] ( )
[ | ] ( )
If all streams can reach minimum compression, disable compression greedily
[ |] ( )
[ |] ( )
[ ] (|)Perform this algorithm on each full update, on each MST link with at least one DSC stream on it
After the configs are computed, call dcn20_add_dsc_to_stream_resource on each stream with DSC enabled. It is only after all streams are created that we can know which of them will need DSC.
Do all of this at the end of amdgpu atomic check. If it fails, fail check; This combination of timings cannot be supported.
v2: Use drm_dp_mst_atomic_check to validate bw for certain dsc configurations
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 362 +++++++++++++++++- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 + 5 files changed, 372 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -8090,6 +8090,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,if (ret) goto fail; +if (!compute_mst_dsc_configs_for_state (state, dm_state->context)) + goto fail; +if (dc_validate_global_state (dc, dm_state->context, false) !=DC_OK ) { ret = -EINVAL ; goto fail;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +360 -2
380 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +3 -0
@@ -34,4 +34,7 @@ int dm_mst_get_pbn_divider(struct dc_link *link);void amdgpu_dm_initialize_dp_connector (struct amdgpu_display_manager *dm,struct amdgpu_dm_connector *aconnector); + +bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state);#endif
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +5 -2
@@ -1488,7 +1488,7 @@ static void release_dsc(struct resource_context *res_ctx, -static enum dc_status add_dsc_to_stream_resource (struct dc *dc, +enum dc_status dcn20_add_dsc_to_stream_resource (struct dc *dc,struct dc_state *dc_ctx,struct dc_stream_state *dc_stream) {
@@ -1503,6 +1503,9 @@ static enum dc_status add_dsc_to_stream_resource(struct dc *dc,if (pipe_ctx->stream != dc_stream)continue ; +if (pipe_ctx->stream_res.dsc) +continue ; +acquire_dsc (&dc_ctx->res_ctx, pool, &pipe_ctx->stream_res.dsc);/* The number of DSCs can be less than the number of pipes */
@@ -1552,7 +1555,7 @@ enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx,/* Get a DSC if required and available */ if (result ==DC_OK && dc_stream->timing.flags.DSC) - result =add_dsc_to_stream_resource (dc, new_ctx, dc_stream); + result =dcn20_add_dsc_to_stream_resource (dc, new_ctx, dc_stream);if (result ==DC_OK ) result =dcn20_build_mapped_resource (dc, new_ctx, dc_stream);
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +1 -0
@@ -157,6 +157,7 @@ void dcn20_calculate_dlg_params(enum dc_status dcn20_build_mapped_resource (const struct dc *dc,struct dc_state *context,struct dc_stream_state *stream);enum dc_status dcn20_add_stream_to_ctx (struct dc *dc,struct dc_state *new_ctx,struct dc_stream_state *dc_stream); +enum dc_status dcn20_add_dsc_to_stream_resource (struct dc *dc,struct dc_state *dc_ctx,struct dc_stream_state *dc_stream);enum dc_status dcn20_remove_stream_from_ctx (struct dc *dc,struct dc_state *new_ctx,struct dc_stream_state *dc_stream);enum dc_status dcn20_get_default_swizzle_mode (struct dc_plane_state *plane_state);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 16/17 drm/amd/display: Recalculate VCPI slots for new DSC connectors
In reply to [email protected]From: Mikita Lipski <[email protected]>
[why]
Since for DSC MST connector's PBN is claculated differently due to compression, we have to recalculate both PBN and VCPI slots for that connector.
[how]
The function iterates through all the active streams to find, which have DSC enabled, then recalculates PBN for it and calls drm_dp_helper_update_vcpi_slots_for_dsc to update connector's VCPI slots.
v2: - use drm_dp_mst_atomic_enable_dsc per port to enable/disable DSC
v3: - Iterate through connector states from the state passed
- On each connector state get stream from dc_state,
instead CRTC state
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 76 +++++++++++++++++-- 1 file changed, 71 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +71 -5
@@ -4986,6 +4986,69 @@ const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs = { .atomic_check = dm_encoder_helper_atomic_check }; +static int dm_update_mst_vcpi_slots_for_dsc (struct drm_atomic_state *state, +struct dc_state *dc_state) +{ +struct dc_stream_state *stream =NULL ; +struct drm_connector *connector; +struct drm_connector_state *new_con_state, *old_con_state; +struct amdgpu_dm_connector *aconnector; +struct dm_connector_state *dm_conn_state; +int i, j, clock, bpp; +int vcpi, pbn_div, pbn =0 ; + +for_each_oldnew_connector_in_state (state, connector, old_con_state, new_con_state, i) { + + aconnector =to_amdgpu_dm_connector (connector); + +if (!aconnector->port) +continue ; + +if (!new_con_state || !new_con_state->crtc) +continue ; + + dm_conn_state =to_dm_connector_state (new_con_state); + +for (j =0 ; j < dc_state->stream_count; j++) { + stream = dc_state->streams[j]; +if (!stream) +continue ; + +if ((struct amdgpu_dm_connector *)stream->dm_stream_context == aconnector) +break ; + + stream =NULL ; + } + +if (!stream) +continue ; + +if (stream->timing.flags.DSC !=1 ) { +drm_dp_mst_atomic_enable_dsc (state, + aconnector->port, + dm_conn_state->pbn, +0 , + false); +continue ; + } + + pbn_div =dm_mst_get_pbn_divider (stream->link); + bpp = stream->timing.dsc_cfg.bits_per_pixel; + clock = stream->timing.pix_clk_100hz /10 ; + pbn =drm_dp_calc_pbn_mode (clock, bpp, true); + vcpi =drm_dp_mst_atomic_enable_dsc (state, + aconnector->port, + pbn, pbn_div, + true); +if (vcpi <0 ) +return vcpi; + + dm_conn_state->pbn = pbn; + dm_conn_state->vcpi_slots = vcpi; + } +return 0 ; +} +static void dm_drm_plane_reset (struct drm_plane *plane) {struct dm_plane_state *amdgpu_state =NULL ;
@@ -8017,11 +8080,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,if (ret) goto fail; -/* Perform validation of MST topology in the state*/ - ret =drm_dp_mst_atomic_check (state); -if (ret) - goto fail; -if (state->legacy_cursor_update) {/* * This is a fast cursor update coming from the plane update
@@ -8093,6 +8151,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,if (!compute_mst_dsc_configs_for_state (state, dm_state->context)) goto fail; + ret =dm_update_mst_vcpi_slots_for_dsc (state, dm_state->context); +if (ret) + goto fail; +if (dc_validate_global_state (dc, dm_state->context, false) !=DC_OK ) { ret = -EINVAL ; goto fail;
@@ -8121,6 +8183,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,dc_retain_state (old_dm_state->context); } } +/* Perform validation of MST topology in the state*/ + ret =drm_dp_mst_atomic_check (state); +if (ret) + goto fail;/* Store the overall update type for use later in atomic check. */ for_each_new_crtc_in_state (state, crtc, new_crtc_state, i) {
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 17/17 drm/amd/display: Trigger modesets on MST DSC connectors
In reply to [email protected]From: Mikita Lipski <[email protected]>
Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing.
Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state
v2: Do this check only on Navi and before adding connectors and planes on modesetting crtcs
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +33 -0
@@ -7924,6 +7924,29 @@ dm_determine_update_type_for_commit(struct amdgpu_display_manager *dm, *out_type = update_type;return ret; } +static int add_affected_mst_dsc_crtcs (struct drm_atomic_state *state,struct drm_crtc *crtc) +{ +struct drm_connector *connector; +struct drm_connector_state *conn_state; +struct amdgpu_dm_connector *aconnector =NULL ; +int i; +for_each_new_connector_in_state (state, connector, conn_state, i) { +if (conn_state->crtc != crtc) +continue ; + + aconnector =to_amdgpu_dm_connector (connector); +if (!aconnector->port) + aconnector =NULL ; +else +break ; + } + +if (!aconnector) +return 0 ; + +return drm_dp_mst_add_affected_dsc_crtcs (state, aconnector->port); + +}/** * amdgpu_dm_atomic_check() - Atomic check implementation for AMDgpu DM.
@@ -7976,6 +7999,16 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, ret =drm_atomic_helper_check_modeset (dev, state);if (ret) goto fail; + +if (adev->asic_type >=CHIP_NAVI10 ) { +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (drm_atomic_crtc_needs_modeset (new_crtc_state)) { + ret =add_affected_mst_dsc_crtcs (state, crtc); +if (ret) + goto fail; + } + } + }for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel