drm/nv50/devinit: reverse the logic for running encoder init scripts

commit ac8cc241a81941932da44993242e68c62e115ec7 upstream.

A single U encoder table can match multiple DCB entries, whereas the
reverse is not true and can lead to us not matching a DCB entry at
all, and fail to initialise some encoders.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c
index ae7249b097971ca4b3ab5eae6d97425014be0cf2..4a85778384172292202cc115f92c9a50132e5c26 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c
@@ -78,12 +78,13 @@ nv50_devinit_init(struct nouveau_object *object)
        if (ret)
                return ret;
 
-       /* if we ran the init tables, execute first script pointer for each
-        * display table output entry that has a matching dcb entry.
+       /* if we ran the init tables, we have to execute the first script
+        * pointer of each dcb entry's display encoder table in order
+        * to properly initialise each encoder.
         */
-       while (priv->base.post && ver) {
-               u16 data = nvbios_outp_parse(bios, i++, &ver, &hdr, &cnt, &len, &info);
-               if (data && dcb_outp_match(bios, info.type, info.mask, &ver, &len, &outp)) {
+       while (priv->base.post && dcb_outp_parse(bios, i, &ver, &hdr, &outp)) {
+               if (nvbios_outp_match(bios, outp.hasht, outp.hashm,
+                                    &ver, &hdr, &cnt, &len, &info)) {
                        struct nvbios_init init = {
                                .subdev = nv_subdev(priv),
                                .bios = bios,
@@ -95,7 +96,8 @@ nv50_devinit_init(struct nouveau_object *object)
 
                        nvbios_exec(&init);
                }
-       };
+               i++;
+       }
 
        return 0;
 }