drm/nouveau: tidy connector/encoder creation a little

Create connectors before encoders to avoid having to do another loop across
encoder list whenever we create a new connector.  This allows us to pass
the connector to the encoder creation functions, and avoid using a
create_resources() callback since we can now call it directly.

This can also potentially modify the connector ordering on nv50.  On cards
where the DCB connector and encoder tables are in the same order, things
will be unchanged.  However, there's some cards where the ordering between
the tables differ, and in one case, leads us to naming the connectors
"wrongly".

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

1 files changed, 4 insertions, 13 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
index 812778db76ac..4832bba7c43a 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -272,32 +272,22 @@ static const struct drm_encoder_funcs nv50_sor_encoder_funcs = {
 };
 
 int
-nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry)
+nv50_sor_create(struct drm_connector *connector, struct dcb_entry *entry)
 {
         struct nouveau_encoder *nv_encoder = NULL;
+        struct drm_device *dev = connector->dev;
         struct drm_encoder *encoder;
-        bool dum;
         int type;
 
         NV_DEBUG_KMS(dev, "\n");
 
         switch (entry->type) {
         case OUTPUT_TMDS:
-                NV_INFO(dev, "Detected a TMDS output\n");
+        case OUTPUT_DP:
                 type = DRM_MODE_ENCODER_TMDS;
                 break;
         case OUTPUT_LVDS:
-                NV_INFO(dev, "Detected a LVDS output\n");
                 type = DRM_MODE_ENCODER_LVDS;
-
-                if (nouveau_bios_parse_lvds_table(dev, 0, &dum, &dum)) {
-                        NV_ERROR(dev, "Failed parsing LVDS table\n");
-                        return -EINVAL;
-                }
-                break;
-        case OUTPUT_DP:
-                NV_INFO(dev, "Detected a DP output\n");
-                type = DRM_MODE_ENCODER_TMDS;
                 break;
         default:
                 return -EINVAL;
@@ -342,5 +332,6 @@ nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry)
                         nv_encoder->dp.mc_unknown = 5;
         }
 
+        drm_mode_connector_attach_encoder(connector, encoder);
         return 0;
 }