modetest: push pipe_resolve_connectors() to set_mode

The function is closely related to pipe_find_crtc_and_mode() so we might
as well keep them together.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Ezequiel Garcia <ezequiel@collabora.com>

diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index b08cb78..4e7026f 100644 (file)
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -1437,6 +1437,10 @@ static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int co
        for (i = 0; i < count; i++) {
                struct pipe_arg *pipe = &pipes[i];
 
+               ret = pipe_resolve_connectors(dev, pipe);
+               if (ret < 0)
+                       return;
+
                ret = pipe_find_crtc_and_mode(dev, pipe);
                if (ret < 0)
                        continue;
@@ -1993,14 +1997,6 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       for (i = 0; i < count; i++) {
-               if (pipe_resolve_connectors(&dev, &pipe_args[i]) < 0) {
-                       free_resources(dev.resources);
-                       drmClose(dev.fd);
-                       return 1;
-               }
-       }
-
 #define dump_resource(dev, res) if (res) dump_##res(dev)
 
        dump_resource(&dev, encoders);