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

drm/nouveau/kms/nv50-: Rename encoder->atomic_(enable|disable) callbacks 



No functional changes, just change the function names to match the
callbacks they provide.

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f575f2bd

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

+16 −17
Original line number Diff line number Diff line
@@ -469,7 +469,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;
@@ -481,7 +481,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);
@@ -539,8 +539,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

};
@@ -1069,7 +1069,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);
@@ -1115,7 +1115,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;
@@ -1132,8 +1132,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,

};
@@ -1629,8 +1629,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);
@@ -1658,7 +1657,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);
@@ -1763,8 +1762,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
@@ -1886,7 +1885,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;
@@ -1898,7 +1897,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);
@@ -1940,8 +1939,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