Commit 5c6fb4b2 authored by Lyude Paul's avatar Lyude Paul Committed by Ben Skeggs
Browse files

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.

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Fixes: 09838c4e ("drm/nouveau/kms: Search for encoders' connectors properly")
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6c27ffab

drivers/gpu/drm/nouveau/dispnv50/disp.c

+14 −15
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE