From: "David R. Hedges" <[email protected]>
When nouveau_connector_detect() can't read an EDID it clears the
connector's EDID, which resets display_info.bpc to 0. A default is
only filled back in by nouveau_connector_detect_depth(), from
->get_modes(), so if the HPD worker's probe loses the EDID and
userspace commits a modeset before it next fetches the mode list,
nv50_outp_atomic_check() sets or.bpc to 0.
For DP, nouveau_dp_train() then computes a minimum link rate of 0, and
nv50_sor_dp_watermark_sst() computes 0 symbols per line and fires
WARNING: drivers/gpu/drm/nouveau/dispnv50/disp.c:1678 at
nv50_sor_dp_watermark_sst.isra.0+0x2ab/0x2c0 [nouveau]
This was seen on a GA102 right after "DDC responded, but no EDID for
DP-3" from the HPD worker, while replugging a DP monitor.
Fall back to 8 bpc when the connector doesn't provide a value, which is
nouveau_connector_detect_depth()'s own default for outputs that are
neither eDP nor LVDS, and do the same in nv50_msto_atomic_check(),
which takes or.bpc from the MST connector the same way. Calling
nouveau_connector_detect_depth() from ->detect() instead isn't an
option, as for LVDS it depends on the native mode that ->get_modes()
sets up.
Fixes: ac2d9275f371 ("drm/nouveau/kms/nv50-: Store the bpc we're using in
nv50_head_atom")
Cc: [email protected]
Link: https://gitlab.freedesktop.org/drm/nouveau/-/work_items/515
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: David R. Hedges <[email protected]>
---
drivers/gpu/drm/nouveau/dispnv50/disp.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 2c66e480b511..a265fd971c99 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -418,8 +418,11 @@ nv50_outp_atomic_check(struct drm_encoder *encoder,
if (ret)
return ret;
+ /* display_info.bpc is reset to 0 when a probe loses the EDID, and
+ * isn't given a default again until ->get_modes() runs.
+ */
if (crtc_state->mode_changed || crtc_state->connectors_changed)
- asyh->or.bpc = connector->display_info.bpc;
+ asyh->or.bpc = connector->display_info.bpc ?: 8;
/* We might have to reduce the bpc */
nv50_outp_atomic_fix_depth(encoder, crtc_state);
@@ -989,7 +992,7 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,
if (!state->duplicated) {
const int clock = crtc_state->adjusted_mode.clock;
- asyh->or.bpc = connector->display_info.bpc;
+ asyh->or.bpc = connector->display_info.bpc ?: 8;
asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, asyh->or.bpc * 3 <<
4);
}
--
2.55.0
