On Wed, Aug 26, 2020 at 02:24:50PM -0400, Lyude Paul wrote:
> This adds support for querying the maximum clock rate of a downstream
> port on a DisplayPort connection. Generally, downstream ports refer to
> active dongles which can have their own pixel clock limits.
>
> Note as well, we also start marking the connector as disconnected if we
> can't read the DPCD, since we wouldn't be able to do anything without
> DPCD access anyway.
>
> Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx>
> Reviewed-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
> ---
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +++
> drivers/gpu/drm/nouveau/nouveau_dp.c | 15 +++++++++++----
> drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 +
> 3 files changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index 8e1effb10425d..d2141ca16107b 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -1258,7 +1258,10 @@ nv50_mstc_detect(struct drm_connector *connector,
>
> ret = drm_dp_mst_detect_port(connector, ctx, mstc->port->mgr,
> mstc->port);
> + if (ret != connector_status_connected)
> + goto out;
>
> +out:
> pm_runtime_mark_last_busy(connector->dev->dev);
> pm_runtime_put_autosuspend(connector->dev->dev);
> return ret;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
> index 005750aeb6d4f..ad852e572cfec 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_dp.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
> @@ -61,6 +61,11 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector,
> mstm->can_mst = drm_dp_read_mst_cap(aux, dpcd);
> }
>
> + ret = drm_dp_read_downstream_info(aux, dpcd,
> + outp->dp.downstream_ports);
> + if (ret < 0)
> + return connector_status_disconnected;
> +
> return connector_status_connected;
> }
>
> @@ -176,8 +181,6 @@ void nouveau_dp_irq(struct nouveau_drm *drm,
> /* TODO:
> * - Use the minimum possible BPC here, once we add support for the max bpc
> * property.
> - * - Validate the mode against downstream port caps (see
> - * drm_dp_downstream_max_clock())
> * - Validate against the DP caps advertised by the GPU (we don't check these
> * yet)
> */
> @@ -188,15 +191,19 @@ nv50_dp_mode_valid(struct drm_connector *connector,
> unsigned *out_clock)
> {
> const unsigned min_clock = 25000;
> - unsigned max_clock, clock;
> + unsigned max_clock, ds_clock, clock;
> enum drm_mode_status ret;
>
> if (mode->flags & DRM_MODE_FLAG_INTERLACE && !outp->caps.dp_interlace)
> return MODE_NO_INTERLACE;
I stumbled on this code when applying my big DFP series (sorry that
I forgot to read this while it was on the list).
Anyways, this code appears somewhat confused about the different
clocks.
>
> max_clock = outp->dp.link_nr * outp->dp.link_bw;
That I presume is the max symbol rate of the link.
> - clock = mode->clock * (connector->display_info.bpc * 3) / 10;
> + ds_clock = drm_dp_downstream_max_clock(outp->dp.dpcd,
> + outp->dp.downstream_ports);
That is the maximum dotclock (also the max TMDS clock before my DFP
series landed) the DFP supports.
> + if (ds_clock)
> + max_clock = min(max_clock, ds_clock);
max() between the symbol rate and dotclock doesn't really
make sense. One is the amount of symbols (or data in other
words), the other is amount of pixels (which depending on
bpc can result in various amounts of symbols/data).
>
> + clock = mode->clock * (connector->display_info.bpc * 3) / 10;
I presume this trying to compute the symbol rate we require.
Due to the 8b/10b encoding each 10bit symbol carries 8 bits of
actual data, so the /10 should be /8. IIRC we had this same
bug in i915, but it was fixed years ago.
This is also calculating things based on display_info.bpc which
IIRC is the max bpc the display supports. Using the max may be
overly pessimistic in case a) the driver/hw doesn't even support
bpc that high, b) the driver can dynamically reduce the bpc in
order to fit the mode onto the link. In i915 we take the opposite
approach and just use the min bpc (==6) in mode_valid(). During
modeset we start from the max bpc and keep reducing it until
things fit.
So I suspect what you want here is something like:
max_clock = outp->dp.link_nr * outp->dp.link_bw;
clock = mode->clock * (connector->display_info.bpc * 3) / 8; // or maybe just use 6 for bpc
if (clock > max_clock)
reurn CLOCK_HIGH;
ds_clock = drm_dp_downstream_max_dotclock();
if (ds_clock && mode->clock > ds_clock)
return CLOCK_HIGH;
+ a bit more if you want to also deal with the TMDS
clock limits sensibly. That also requires some though
as to which bpc to use. In i915 we assume 8bpc when
calculating the TMDS clock since that's the minimum
DVI/HDMI supports.
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
