drm/nouveau/kms/nv50-: Reverse args for nv50_outp_get_(old|new)_connector()

Just to be more consistent with the order of args that DRM helpers like
drm_atomic_get_new_crtc_state() use.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 07504ebbb9cc27ee4fc215374b05b7fe9b52cea9..65c555dda7da6b561f41713e518e50110d2cca96 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -432,8 +432,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;
@@ -449,8 +448,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;
@@ -757,7 +755,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;
 
@@ -824,7 +822,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;
 
@@ -1632,8 +1630,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;
 
@@ -1680,7 +1677,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta
        u8 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 ||

diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
index 21937f1c7dd90e8ced809e081755a2898db770af..0dea219a666e2befa3b5ceff27fdbc84701866d1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
@@ -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);