drm/nouveau: Finish atomic cleanup + fix regression
Subsystems (3)
Lyude Paul
maintainercover drm/nouveau: Finish atomic cleanup + fix regression
This series just fixes a regression I accidentally introduced when fixing how we find the currently set connectors for a given encoder:
09838c4efe9a ("drm/nouveau/kms: Search for encoders' connectors properly")
As well, this goes through and finishes cleaning up any references to drm_encoder->crtc, any inappropriate references to drm_crtc->state, and one inappropriate reference to drm_connector->state that I noticed along the way.
Lyude Paul (8):
drm/nouveau/kms/nv50-: Use atomic encoder callbacks everywhere drm/nouveau/kms/nv50-: Remove (nv_encoder->crtc) checks in ->disable
callbacks
drm/nouveau/kms/nv50-: Rename encoder->atomic_(enable|disable)
callbacks
drm/nouveau/kms/nv50-: s/armh/asyh/ in nv50_msto_atomic_enable() drm/nouveau/kms/nv50-: Reverse args for
nv50_outp_get_(old|new)_connector()
drm/nouveau/kms/nv50-: Lookup current encoder/crtc from atomic state drm/nouveau/kms/nv50-: Use nouveau_encoder->crtc in get_eld callback drm/nouveau/kms/nv50-: Fix locking for audio callbacks
drivers/gpu/drm/nouveau/dispnv50/disp.c | 216 ++++++++++++---------- drivers/gpu/drm/nouveau/nouveau_drv.h | 1 + drivers/gpu/drm/nouveau/nouveau_encoder.h | 13 +- 3 files changed, 124 insertions(+), 106 deletions(-)
Signature · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Lyude Paul
maintainerPATCH 1/8 drm/nouveau/kms/nv50-: Use atomic encoder callbacks everywhere
It turns out that I forgot to go through and make sure that I converted all encoder callbacks to use atomic_enable/atomic_disable(), so let's go and actually do that.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +14 -15
@@ -455,7 +455,7 @@ nv50_outp_get_old_connector(struct nouveau_encoder *outp,* DAC *****************************************************************************/ static void -nv50_dac_disable (struct drm_encoder *encoder) +nv50_dac_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;
@@ -467,7 +467,7 @@ nv50_dac_disable(struct drm_encoder *encoder) }static void -nv50_dac_enable (struct drm_encoder *encoder) +nv50_dac_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);
@@ -525,8 +525,8 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)static const struct drm_encoder_helper_funcs nv50_dac_help = { .atomic_check = nv50_outp_atomic_check, - .enable = nv50_dac_enable, - .disable = nv50_dac_disable, + .atomic_enable = nv50_dac_enable, + .atomic_disable = nv50_dac_disable, .detect = nv50_dac_detect };
@@ -1055,7 +1055,7 @@ nv50_dp_bpc_to_depth(unsigned int bpc) }static void -nv50_msto_enable (struct drm_encoder *encoder) +nv50_msto_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nv50_head *head =nv50_head (encoder->crtc);struct nv50_head_atom *armh =nv50_head_atom (head->base.base.state);
@@ -1101,7 +1101,7 @@ nv50_msto_enable(struct drm_encoder *encoder) }static void -nv50_msto_disable (struct drm_encoder *encoder) +nv50_msto_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nv50_msto *msto =nv50_msto (encoder);struct nv50_mstc *mstc = msto->mstc;
@@ -1118,8 +1118,8 @@ nv50_msto_disable(struct drm_encoder *encoder)static const struct drm_encoder_helper_funcs nv50_msto_help = { - .disable = nv50_msto_disable, - .enable = nv50_msto_enable, + .atomic_disable = nv50_msto_disable, + .atomic_enable = nv50_msto_enable, .atomic_check = nv50_msto_atomic_check, };
@@ -1645,8 +1645,7 @@ nv50_sor_disable(struct drm_encoder *encoder, }static void -nv50_sor_enable (struct drm_encoder *encoder, -struct drm_atomic_state *state) +nv50_sor_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);
@@ -1873,7 +1872,7 @@ nv50_pior_atomic_check(struct drm_encoder *encoder, }static void -nv50_pior_disable (struct drm_encoder *encoder) +nv50_pior_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;
@@ -1885,7 +1884,7 @@ nv50_pior_disable(struct drm_encoder *encoder) }static void -nv50_pior_enable (struct drm_encoder *encoder) +nv50_pior_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);
@@ -1921,14 +1920,14 @@ nv50_pior_enable(struct drm_encoder *encoder) } core->func->pior->ctrl (core, nv_encoder->or, ctrl, asyh); - nv_encoder->crtc = encoder->crtc; + nv_encoder->crtc = &nv_crtc->base; }static const struct drm_encoder_helper_funcs nv50_pior_help = { .atomic_check = nv50_pior_atomic_check, - .enable = nv50_pior_enable, - .disable = nv50_pior_disable, + .atomic_enable = nv50_pior_enable, + .atomic_disable = nv50_pior_disable, }; static void
Signature · 1 line
2.28.0
Ben Skeggs
AppliedRe: [Nouveau] [PATCH 1/8] drm/nouveau/kms/nv50-: Use atomic encoder callbacks everywhere
I've merged all of these. Sent the first to 5.10-fixes for the regression there, the rest will go in with a later -next pull request.
Thanks,
Ben.
Quoted 127 lines · Lyude Paul
It turns out that I forgot to go through and make sure that I converted all encoder callbacks to use atomic_enable/atomic_disable(), so let's go and actually do that.
Signed-off-by Lyude Paul <[email protected]>Cc Kirill A. Shutemov <[email protected]>Fixes 09838c4efe9a ("drm/nouveau/kms: Search for encoders' connectors properly")--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-)drivers/gpu/drm/nouveau/dispnv50/disp.c +14
-16@@ -455,7 +455,7 @@ nv50_outp_get_old_connector(struct nouveau_encoder *outp,* DAC *****************************************************************************/ static void -nv50_dac_disable (struct drm_encoder *encoder) +nv50_dac_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;@@ -467,7 +467,7 @@ nv50_dac_disable(struct drm_encoder *encoder) }static void -nv50_dac_enable (struct drm_encoder *encoder) +nv50_dac_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);@@ -525,8 +525,8 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)static const struct drm_encoder_helper_funcs nv50_dac_help = { .atomic_check = nv50_outp_atomic_check, - .enable = nv50_dac_enable, - .disable = nv50_dac_disable, + .atomic_enable = nv50_dac_enable, + .atomic_disable = nv50_dac_disable, .detect = nv50_dac_detect };@@ -1055,7 +1055,7 @@ nv50_dp_bpc_to_depth(unsigned int bpc) }static void -nv50_msto_enable (struct drm_encoder *encoder) +nv50_msto_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nv50_head *head =nv50_head (encoder->crtc);struct nv50_head_atom *armh =nv50_head_atom (head->base.base.state);@@ -1101,7 +1101,7 @@ nv50_msto_enable(struct drm_encoder *encoder) }static void -nv50_msto_disable (struct drm_encoder *encoder) +nv50_msto_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nv50_msto *msto =nv50_msto (encoder);struct nv50_mstc *mstc = msto->mstc;@@ -1118,8 +1118,8 @@ nv50_msto_disable(struct drm_encoder *encoder)static const struct drm_encoder_helper_funcs nv50_msto_help = { - .disable = nv50_msto_disable, - .enable = nv50_msto_enable, + .atomic_disable = nv50_msto_disable, + .atomic_enable = nv50_msto_enable, .atomic_check = nv50_msto_atomic_check, };@@ -1645,8 +1645,7 @@ nv50_sor_disable(struct drm_encoder *encoder, }static void -nv50_sor_enable (struct drm_encoder *encoder, -struct drm_atomic_state *state) +nv50_sor_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);@@ -1873,7 +1872,7 @@ nv50_pior_atomic_check(struct drm_encoder *encoder, }static void -nv50_pior_disable (struct drm_encoder *encoder) +nv50_pior_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;@@ -1885,7 +1884,7 @@ nv50_pior_disable(struct drm_encoder *encoder) }static void -nv50_pior_enable (struct drm_encoder *encoder) +nv50_pior_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);@@ -1921,14 +1920,14 @@ nv50_pior_enable(struct drm_encoder *encoder) } core->func->pior->ctrl (core, nv_encoder->or, ctrl, asyh); - nv_encoder->crtc = encoder->crtc; + nv_encoder->crtc = &nv_crtc->base; }static const struct drm_encoder_helper_funcs nv50_pior_help = { .atomic_check = nv50_pior_atomic_check, - .enable = nv50_pior_enable, - .disable = nv50_pior_disable, + .atomic_enable = nv50_pior_enable, + .atomic_disable = nv50_pior_disable, }; static void --2.28.0
_______________________________________________
Nouveau mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
Lyude Paul
maintainerPATCH 2/8 drm/nouveau/kms/nv50-: Remove (nv_encoder->crtc) checks in ->disable callbacks
In reply to Lyude PaulNoticed these in both the disable (which we'll be getting rid of in a moment) and the atomic disable callbacks: both callback types check whether or not there's actually a CRTC assigned to the given encoder. However, as ->atomic_disable and ->disable will never be called without a CRTC assigned to the given encoder there's no point in this check. So just remove it.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 37 ++++++++++++------------- 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +17 -20
@@ -460,8 +460,8 @@ nv50_dac_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;const u32 ctrl =NVDEF (NV507D ,DAC_SET_CONTROL ,OWNER ,NONE ); -if (nv_encoder->crtc) - core->func->dac->ctrl (core, nv_encoder->or, ctrl,NULL ); + + core->func->dac->ctrl (core, nv_encoder->or, ctrl,NULL ); nv_encoder->crtc =NULL ;nv50_outp_release (nv_encoder); }
@@ -1620,28 +1620,25 @@ nv50_sor_disable(struct drm_encoder *encoder,struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (nv_encoder, state); +struct drm_dp_aux *aux = &nv_connector->aux; +u8 pwr; nv_encoder->crtc =NULL ; -if (nv_crtc) { -struct drm_dp_aux *aux = &nv_connector->aux; -u8 pwr; +if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) { +int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr); -if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) { -int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr); - -if (ret ==0 ) { - pwr &= ~DP_SET_POWER_MASK ; - pwr |=DP_SET_POWER_D3 ; -drm_dp_dpcd_writeb (aux,DP_SET_POWER , pwr); - } +if (ret ==0 ) { + pwr &= ~DP_SET_POWER_MASK ; + pwr |=DP_SET_POWER_D3 ; +drm_dp_dpcd_writeb (aux,DP_SET_POWER , pwr); } - - nv_encoder->update (nv_encoder, nv_crtc->index,NULL ,0 ,0 ); -nv50_audio_disable (encoder, nv_crtc); -nv50_hdmi_disable (&nv_encoder->base.base, nv_crtc); -nv50_outp_release (nv_encoder); } + + nv_encoder->update (nv_encoder, nv_crtc->index,NULL ,0 ,0 ); +nv50_audio_disable (encoder, nv_crtc); +nv50_hdmi_disable (&nv_encoder->base.base, nv_crtc); +nv50_outp_release (nv_encoder); } static void
@@ -1877,8 +1874,8 @@ nv50_pior_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;const u32 ctrl =NVDEF (NV507D ,PIOR_SET_CONTROL ,OWNER ,NONE ); -if (nv_encoder->crtc) - core->func->pior->ctrl (core, nv_encoder->or, ctrl,NULL ); + + core->func->pior->ctrl (core, nv_encoder->or, ctrl,NULL ); nv_encoder->crtc =NULL ;nv50_outp_release (nv_encoder); }
Signature · 1 line
2.28.0
Lyude Paul
maintainerPATCH 3/8 drm/nouveau/kms/nv50-: Rename encoder->atomic_(enable|disable) callbacks
In reply to Lyude PaulNo functional changes, just change the function names to match the callbacks they provide.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 33 ++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +16 -17
@@ -455,7 +455,7 @@ nv50_outp_get_old_connector(struct nouveau_encoder *outp,* DAC *****************************************************************************/ static void -nv50_dac_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) +nv50_dac_atomic_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;
@@ -467,7 +467,7 @@ nv50_dac_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) }static void -nv50_dac_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) +nv50_dac_atomic_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);
@@ -525,8 +525,8 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)static const struct drm_encoder_helper_funcs nv50_dac_help = { .atomic_check = nv50_outp_atomic_check, - .atomic_enable = nv50_dac_enable, - .atomic_disable = nv50_dac_disable, + .atomic_enable = nv50_dac_atomic_enable, + .atomic_disable = nv50_dac_atomic_disable, .detect = nv50_dac_detect };
@@ -1055,7 +1055,7 @@ nv50_dp_bpc_to_depth(unsigned int bpc) }static void -nv50_msto_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) +nv50_msto_atomic_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nv50_head *head =nv50_head (encoder->crtc);struct nv50_head_atom *armh =nv50_head_atom (head->base.base.state);
@@ -1101,7 +1101,7 @@ nv50_msto_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) }static void -nv50_msto_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) +nv50_msto_atomic_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nv50_msto *msto =nv50_msto (encoder);struct nv50_mstc *mstc = msto->mstc;
@@ -1118,8 +1118,8 @@ nv50_msto_disable(struct drm_encoder *encoder, struct drm_atomic_state *state)static const struct drm_encoder_helper_funcs nv50_msto_help = { - .atomic_disable = nv50_msto_disable, - .atomic_enable = nv50_msto_enable, + .atomic_disable = nv50_msto_atomic_disable, + .atomic_enable = nv50_msto_atomic_enable, .atomic_check = nv50_msto_atomic_check, };
@@ -1613,8 +1613,7 @@ nv50_sor_update(struct nouveau_encoder *nv_encoder, u8 head, }static void -nv50_sor_disable (struct drm_encoder *encoder, -struct drm_atomic_state *state) +nv50_sor_atomic_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc);
@@ -1642,7 +1641,7 @@ nv50_sor_disable(struct drm_encoder *encoder, }static void -nv50_sor_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) +nv50_sor_atomic_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);
@@ -1747,8 +1746,8 @@ nv50_sor_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)static const struct drm_encoder_helper_funcs nv50_sor_help = { .atomic_check = nv50_outp_atomic_check, - .atomic_enable = nv50_sor_enable, - .atomic_disable = nv50_sor_disable, + .atomic_enable = nv50_sor_atomic_enable, + .atomic_disable = nv50_sor_atomic_disable, }; static void
@@ -1869,7 +1868,7 @@ nv50_pior_atomic_check(struct drm_encoder *encoder, }static void -nv50_pior_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) +nv50_pior_atomic_disable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nv50_core *core =nv50_disp (encoder->dev)->core;
@@ -1881,7 +1880,7 @@ nv50_pior_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) }static void -nv50_pior_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) +nv50_pior_atomic_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);
@@ -1923,8 +1922,8 @@ nv50_pior_enable(struct drm_encoder *encoder, struct drm_atomic_state *state)static const struct drm_encoder_helper_funcs nv50_pior_help = { .atomic_check = nv50_pior_atomic_check, - .atomic_enable = nv50_pior_enable, - .atomic_disable = nv50_pior_disable, + .atomic_enable = nv50_pior_atomic_enable, + .atomic_disable = nv50_pior_atomic_disable, }; static void
Signature · 1 line
2.28.0
Lyude Paul
maintainerPATCH 4/8 drm/nouveau/kms/nv50-: s/armh/asyh/ in nv50_msto_atomic_enable()
In reply to Lyude PaulI have a strange dejavu feeling that I tried to submit a patch for this in the past, but that it was rejected. I can't remember though, but I'm further convinced this patch is the right thing to do anyway.
We label the to-be-committed head state in nv50_msto_atomic_enable() as armh. Normally armh implies a state which is currently armed in hardware. nv50_msto_atomic_enable() is called _after_ drm_atomic_swap_state() however, but before the commit tail ends, which means that said state is not actually armed on hardware.
As well - take note that this is the same convention followed in all of the other atomic_enable() callbacks.
So, let's correct this to asyh.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +4 -5
@@ -1058,7 +1058,7 @@ static void nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nv50_head *head = nv50_head(encoder->crtc); -struct nv50_head_atom *armh =nv50_head_atom (head->base.base.state); +struct nv50_head_atom *asyh =nv50_head_atom (head->base.base.state);struct nv50_msto *msto =nv50_msto (encoder);struct nv50_mstc *mstc =NULL ;struct nv50_mstm *mstm =NULL ;
@@ -1080,8 +1080,7 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *stif (WARN_ON (!mstc))return ; - r =drm_dp_mst_allocate_vcpi (&mstm->mgr, mstc->port, armh->dp.pbn, - armh->dp.tu); + r =drm_dp_mst_allocate_vcpi (&mstm->mgr, mstc->port, asyh->dp.pbn, asyh->dp.tu);if (!r)DRM_DEBUG_KMS ("Failed to allocate VCPI\n" );
@@ -1093,8 +1092,8 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *stelse proto =NV917D_SOR_SET_CONTROL_PROTOCOL_DP_B ; - mstm->outp->update (mstm->outp, head->base.index, armh, proto, -nv50_dp_bpc_to_depth (armh->or.bpc)); + mstm->outp->update (mstm->outp, head->base.index, asyh, proto, +nv50_dp_bpc_to_depth (asyh->or.bpc)); msto->mstc = mstc; mstm->modified = true;
Signature · 1 line
2.28.0
Lyude Paul
maintainerPATCH 5/8 drm/nouveau/kms/nv50-: Reverse args for nv50_outp_get_(old|new)_connector()
In reply to Lyude PaulJust to be more consistent with the order of args that DRM helpers like drm_atomic_get_new_crtc_state() use.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 15 ++++++--------- drivers/gpu/drm/nouveau/nouveau_encoder.h | 6 ++---- 2 files changed, 8 insertions(+), 13 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +6 -9
@@ -418,8 +418,7 @@ nv50_outp_atomic_check(struct drm_encoder *encoder, }struct nouveau_connector * -nv50_outp_get_new_connector (struct nouveau_encoder *outp, -struct drm_atomic_state *state) +nv50_outp_get_new_connector (struct drm_atomic_state *state,struct nouveau_encoder *outp) {struct drm_connector *connector;struct drm_connector_state *connector_state;
@@ -435,8 +434,7 @@ nv50_outp_get_new_connector(struct nouveau_encoder *outp, }struct nouveau_connector * -nv50_outp_get_old_connector (struct nouveau_encoder *outp, -struct drm_atomic_state *state) +nv50_outp_get_old_connector (struct drm_atomic_state *state,struct nouveau_encoder *outp) {struct drm_connector *connector;struct drm_connector_state *connector_state;
@@ -743,7 +741,7 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, (0x0100 << nv_crtc->index), }; - nv_connector =nv50_outp_get_new_connector (nv_encoder, state); + nv_connector =nv50_outp_get_new_connector (state, nv_encoder);if (!drm_detect_monitor_audio (nv_connector->edid))return ;
@@ -810,7 +808,7 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state,int ret;int size; - nv_connector =nv50_outp_get_new_connector (nv_encoder, state); + nv_connector =nv50_outp_get_new_connector (state, nv_encoder);if (!drm_detect_hdmi_monitor (nv_connector->edid))return ;
@@ -1616,8 +1614,7 @@ nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *st {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc); -struct nouveau_connector *nv_connector = -nv50_outp_get_old_connector (nv_encoder, state); +struct nouveau_connector *nv_connector =nv50_outp_get_old_connector (state, nv_encoder);struct drm_dp_aux *aux = &nv_connector->aux;u8 pwr;
@@ -1664,7 +1661,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *stau8 proto =NV507D_SOR_SET_CONTROL_PROTOCOL_CUSTOM ;u8 depth =NV837D_SOR_SET_CONTROL_PIXEL_DEPTH_DEFAULT ; - nv_connector =nv50_outp_get_new_connector (nv_encoder, state); + nv_connector =nv50_outp_get_new_connector (state, nv_encoder); nv_encoder->crtc = encoder->crtc; if ((disp->disp->object.oclass == GT214_DISP ||
drivers/gpu/drm/nouveau/nouveau_encoder.h +2 -4
@@ -141,11 +141,9 @@ enum drm_mode_status nv50_dp_mode_valid(struct drm_connector *, unsigned *clock);struct nouveau_connector * -nv50_outp_get_new_connector (struct nouveau_encoder *outp, -struct drm_atomic_state *state); +nv50_outp_get_new_connector (struct drm_atomic_state *state,struct nouveau_encoder *outp);struct nouveau_connector * -nv50_outp_get_old_connector (struct nouveau_encoder *outp, -struct drm_atomic_state *state); +nv50_outp_get_old_connector (struct drm_atomic_state *state,struct nouveau_encoder *outp);int nv50_mstm_detect (struct nouveau_encoder *encoder);void nv50_mstm_remove (struct nv50_mstm *mstm);
Signature · 1 line
2.28.0
Lyude Paul
maintainerPATCH 6/8 drm/nouveau/kms/nv50-: Lookup current encoder/crtc from atomic state
In reply to Lyude PaulDespite being an atomic driver, nouveau has a lot of leftover code that relies on retrieving information regarding the new atomic state from members of drm_encoder and drm_crtc. The first field being used, drm_encoder.crtc, is deprecated for atomic drivers. The second field being used is drm_crtc.state, which is only really sensible to use outside of an atomic modeset.
So, add some helpers to lookup the current crtc for a given outp from the atomic state. Then, convert most of the code in dispnv50/disp.c to use said new helper, along with the relevant DRM atomic helpers for retrieving the new encoder/crtc combinations for a new atomic state.
Note that we don't get rid of the nouveau_encoder.crtc field entirely for three reasons:
- Legacy modesetting for pre-nv50 still uses it
- It doesn't cause any locking issues
- We need it for the HDA callbacks, as grabbing atomic modesetting locks in those would be a mess.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 59 ++++++++++++++++--------- 1 file changed, 38 insertions(+), 21 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +38 -21
@@ -449,6 +449,22 @@ nv50_outp_get_old_connector(struct drm_atomic_state *state, struct nouveau_encodreturn NULL ; } +static struct nouveau_crtc * +nv50_outp_get_new_crtc (const struct drm_atomic_state *state,const struct nouveau_encoder *outp) +{ +struct drm_crtc *crtc; +struct drm_crtc_state *crtc_state; +const u32 mask =drm_encoder_mask (&outp->base.base); +int i; + +for_each_new_crtc_in_state (state, crtc, crtc_state, i) { +if (crtc_state->encoder_mask & mask) +return nouveau_crtc (crtc); + } + +return NULL ; +} +/****************************************************************************** * DAC *****************************************************************************/
@@ -468,8 +484,9 @@ static void nv50_dac_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc); -struct nv50_head_atom *asyh =nv50_head_atom (nv_crtc->base.state); +struct nouveau_crtc *nv_crtc =nv50_outp_get_new_crtc (state, nv_encoder); +struct nv50_head_atom *asyh = +nv50_head_atom (drm_atomic_get_new_crtc_state (state, &nv_crtc->base));struct nv50_core *core =nv50_disp (encoder->dev)->core;u32 ctrl =0 ;
@@ -490,7 +507,7 @@ nv50_dac_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta core->func->dac->ctrl (core, nv_encoder->or, ctrl, asyh); asyh->or.depth =0 ; - nv_encoder->crtc = encoder->crtc; + nv_encoder->crtc = &nv_crtc->base; } static enum drm_connector_status
@@ -719,13 +736,12 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) }static void -nv50_audio_enable (struct drm_encoder *encoder,struct drm_atomic_state *state, +nv50_audio_enable (struct drm_encoder *encoder,struct nouveau_crtc *nv_crtc, +struct nouveau_connector *nv_connector,struct drm_atomic_state *state,struct drm_display_mode *mode) {struct nouveau_drm *drm =nouveau_drm (encoder->dev);struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder); -struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc); -struct nouveau_connector *nv_connector;struct nv50_disp *disp =nv50_disp (encoder->dev); struct __packed { struct {
@@ -741,7 +757,6 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, (0x0100 << nv_crtc->index), }; - nv_connector =nv50_outp_get_new_connector (state, nv_encoder);if (!drm_detect_monitor_audio (nv_connector->edid))return ;
@@ -778,12 +793,12 @@ nv50_hdmi_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) }static void -nv50_hdmi_enable (struct drm_encoder *encoder,struct drm_atomic_state *state, +nv50_hdmi_enable (struct drm_encoder *encoder,struct nouveau_crtc *nv_crtc, +struct nouveau_connector *nv_connector,struct drm_atomic_state *state,struct drm_display_mode *mode) {struct nouveau_drm *drm =nouveau_drm (encoder->dev);struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder); -struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc);struct nv50_disp *disp =nv50_disp (encoder->dev);struct {struct nv50_disp_mthd_v1 base;
@@ -798,7 +813,6 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, .pwr.state = 1, .pwr.rekey = 56, /* binary driver, and tegra, constant */ }; -struct nouveau_connector *nv_connector;struct drm_hdmi_info *hdmi;u32 max_ac_packet;union hdmi_infoframe avi_frame;
@@ -808,7 +822,6 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state,int ret;int size; - nv_connector =nv50_outp_get_new_connector (state, nv_encoder);if (!drm_detect_hdmi_monitor (nv_connector->edid))return ;
@@ -854,7 +867,7 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct drm_atomic_state *state, + args.pwr.vendor_infoframe_length;nvif_mthd (&disp->disp->object,0 , &args, size); -nv50_audio_enable (encoder, state, mode); +nv50_audio_enable (encoder, nv_crtc, nv_connector, state, mode);/* If SCDC is supported by the downstream monitor, update * divider / scrambling settings to what we programmed above.
@@ -895,6 +908,7 @@ struct nv50_mstc {struct nv50_msto {struct drm_encoder encoder; +/* head is statically assigned on msto creation */ struct nv50_head *head;struct nv50_mstc *mstc;bool disabled;
@@ -1055,9 +1069,10 @@ nv50_dp_bpc_to_depth(unsigned int bpc)static void nv50_msto_atomic_enable (struct drm_encoder *encoder,struct drm_atomic_state *state) { -struct nv50_head *head =nv50_head (encoder->crtc); -struct nv50_head_atom *asyh =nv50_head_atom (head->base.base.state);struct nv50_msto *msto =nv50_msto (encoder); +struct nv50_head *head = msto->head; +struct nv50_head_atom *asyh = +nv50_head_atom (drm_atomic_get_new_crtc_state (state, &head->base.base));struct nv50_mstc *mstc =NULL ;struct nv50_mstm *mstm =NULL ;struct drm_connector *connector;
@@ -1640,8 +1655,9 @@ static void nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc); -struct nv50_head_atom *asyh =nv50_head_atom (nv_crtc->base.state); +struct nouveau_crtc *nv_crtc =nv50_outp_get_new_crtc (state, nv_encoder); +struct nv50_head_atom *asyh = +nv50_head_atom (drm_atomic_get_new_crtc_state (state, &nv_crtc->base));struct drm_display_mode *mode = &asyh->state.adjusted_mode; struct { struct nv50_disp_mthd_v1 base;
@@ -1662,7 +1678,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *stau8 depth =NV837D_SOR_SET_CONTROL_PIXEL_DEPTH_DEFAULT ; nv_connector =nv50_outp_get_new_connector (state, nv_encoder); - nv_encoder->crtc = encoder->crtc; + nv_encoder->crtc = &nv_crtc->base; if ((disp->disp->object.oclass == GT214_DISP || disp->disp->object.oclass >= GF110_DISP) &&
@@ -1688,7 +1704,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta proto =NV507D_SOR_SET_CONTROL_PROTOCOL_SINGLE_TMDS_B ; } -nv50_hdmi_enable (&nv_encoder->base.base, state, mode); +nv50_hdmi_enable (&nv_encoder->base.base, nv_crtc, nv_connector, state, mode);break ;case DCB_OUTPUT_LVDS : proto =NV507D_SOR_SET_CONTROL_PROTOCOL_LVDS_CUSTOM ;
@@ -1729,7 +1745,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *staelse proto =NV887D_SOR_SET_CONTROL_PROTOCOL_DP_B ; -nv50_audio_enable (encoder, state, mode); +nv50_audio_enable (encoder, nv_crtc, nv_connector, state, mode);break ;default :BUG ();
@@ -1879,8 +1895,9 @@ static void nv50_pior_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *state) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); -struct nouveau_crtc *nv_crtc =nouveau_crtc (encoder->crtc); -struct nv50_head_atom *asyh =nv50_head_atom (nv_crtc->base.state); +struct nouveau_crtc *nv_crtc =nv50_outp_get_new_crtc (state, nv_encoder); +struct nv50_head_atom *asyh = +nv50_head_atom (drm_atomic_get_new_crtc_state (state, &nv_crtc->base));struct nv50_core *core =nv50_disp (encoder->dev)->core;u32 ctrl =0 ;
Signature · 1 line
2.28.0
Lyude Paul
maintainerPATCH 7/8 drm/nouveau/kms/nv50-: Use nouveau_encoder->crtc in get_eld callback
In reply to Lyude Pauldrm_encoder->crtc is deprecated for atomic drivers, but nouveau_encoder->crtc is safe.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -1
@@ -630,7 +630,7 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id,if (!nv_connector)continue ; - nv_crtc =nouveau_crtc (encoder->crtc); + nv_crtc =nouveau_crtc (nv_encoder->crtc);if (!nv_crtc || nv_encoder->or != port || nv_crtc->index != dev_id)continue ;
Signature · 1 line
2.28.0
Lyude Paul
maintainerPATCH 8/8 drm/nouveau/kms/nv50-: Fix locking for audio callbacks
In reply to Lyude PaulNoticed that I wasn't paying close enough attention the last time I looked at our audio callbacks, as I completely missed the fact that we were figuring out which audio-enabled connector goes to each encoder by checking it's state, but without grabbing any of the appropriate modesetting locks to do so.
That being said however: trying to grab modesetting locks in our audio callbacks would be very painful due to the potential for locking inversion between HDA and DRM. So, let's instead just copy what i915 does again - add our own audio lock to protect audio related state, and store each audio enabled connector in each nouveau_encoder struct so that we don't need to check any atomic states.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 66 ++++++++++++----------- drivers/gpu/drm/nouveau/nouveau_drv.h | 1 + drivers/gpu/drm/nouveau/nouveau_encoder.h | 7 ++- 3 files changed, 43 insertions(+), 31 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +36 -30
@@ -607,34 +607,27 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id,struct nouveau_drm *drm =nouveau_drm (drm_dev);struct drm_encoder *encoder;struct nouveau_encoder *nv_encoder; -struct drm_connector *connector;struct nouveau_crtc *nv_crtc; -struct drm_connector_list_iter conn_iter;int ret =0 ; *enabled = false; +mutex_lock (&drm->audio.lock); +drm_for_each_encoder (encoder, drm->dev) {struct nouveau_connector *nv_connector =NULL ; +if (encoder->encoder_type ==DRM_MODE_ENCODER_DPMST ) +continue ;/* TODO */ + nv_encoder =nouveau_encoder (encoder); + nv_connector =nouveau_connector (nv_encoder->audio.connector); + nv_crtc =nouveau_crtc (nv_encoder->crtc); -drm_connector_list_iter_begin (drm_dev, &conn_iter); -drm_for_each_connector_iter (connector, &conn_iter) { -if (connector->state->best_encoder == encoder) { - nv_connector =nouveau_connector (connector); -break ; - } - } -drm_connector_list_iter_end (&conn_iter); -if (!nv_connector) +if (!nv_crtc || nv_encoder->or != port || nv_crtc->index != dev_id)continue ; - nv_crtc =nouveau_crtc (nv_encoder->crtc); -if (!nv_crtc || nv_encoder->or != port || - nv_crtc->index != dev_id) -continue ; - *enabled = nv_encoder->audio; + *enabled = nv_encoder->audio.enabled;if (*enabled) { ret =drm_eld_size (nv_connector->base.eld); memcpy(buf, nv_connector->base.eld,
@@ -643,6 +636,8 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id,break ; } +mutex_unlock (&drm->audio.lock); +return ret; }
@@ -692,17 +687,22 @@ static const struct component_ops nv50_audio_component_bind_ops = {static void nv50_audio_component_init (struct nouveau_drm *drm) { -if (!component_add (drm->dev->dev, &nv50_audio_component_bind_ops)) - drm->audio.component_registered = true; +if (component_add (drm->dev->dev, &nv50_audio_component_bind_ops)) +return ; + + drm->audio.component_registered = true; +mutex_init (&drm->audio.lock); }static void nv50_audio_component_fini (struct nouveau_drm *drm) { -if (drm->audio.component_registered) { -component_del (drm->dev->dev, &nv50_audio_component_bind_ops); - drm->audio.component_registered = false; - } +if (!drm->audio.component_registered) +return ; + +component_del (drm->dev->dev, &nv50_audio_component_bind_ops); + drm->audio.component_registered = false; +mutex_destroy (&drm->audio.lock); }/******************************************************************************
@@ -725,11 +725,13 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) (0x0100 << nv_crtc->index), }; -if (!nv_encoder->audio) -return ; - - nv_encoder->audio = false; -nvif_mthd (&disp->disp->object,0 , &args,sizeof (args)); +mutex_lock (&drm->audio.lock); +if (nv_encoder->audio.enabled) { + nv_encoder->audio.enabled = false; + nv_encoder->audio.connector =NULL ; +nvif_mthd (&disp->disp->object,0 , &args,sizeof (args)); + } +mutex_unlock (&drm->audio.lock);nv50_audio_component_eld_notify (drm->audio.component, nv_encoder->or, nv_crtc->index);
@@ -760,11 +762,16 @@ nv50_audio_enable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc,if (!drm_detect_monitor_audio (nv_connector->edid))return ; +mutex_lock (&drm->audio.lock); +memcpy (args.data, nv_connector->base.eld,sizeof (args.data));nvif_mthd (&disp->disp->object,0 , &args,sizeof (args.base) +drm_eld_size (args.data)); - nv_encoder->audio = true; + nv_encoder->audio.enabled = true; + nv_encoder->audio.connector = &nv_connector->base; + +mutex_unlock (&drm->audio.lock);nv50_audio_component_eld_notify (drm->audio.component, nv_encoder->or, nv_crtc->index);
@@ -1633,8 +1640,6 @@ nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *ststruct drm_dp_aux *aux = &nv_connector->aux;u8 pwr; - nv_encoder->crtc =NULL ; -if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) {int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr);
@@ -1649,6 +1654,7 @@ nv50_sor_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *stnv50_audio_disable (encoder, nv_crtc);nv50_hdmi_disable (&nv_encoder->base.base, nv_crtc);nv50_outp_release (nv_encoder); + nv_encoder->crtc =NULL ; } static void
drivers/gpu/drm/nouveau/nouveau_drv.h +1 -0
@@ -222,6 +222,7 @@ struct nouveau_drm {struct {struct drm_audio_component *component; +struct mutex lock;bool component_registered; } audio; };
drivers/gpu/drm/nouveau/nouveau_encoder.h +6 -1
@@ -53,7 +53,12 @@ struct nouveau_encoder {* actually programmed on the hw, not the proposed crtc */ struct drm_crtc *crtc;u32 ctrl; -bool audio; + +/* Protected by nouveau_drm.audio.lock */ +struct { +bool enabled; +struct drm_connector *connector; + } audio;struct drm_display_mode mode;int last_dpms;
Signature · 1 line
2.28.0