From patchwork Tue May 30 20:01:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Wentland X-Patchwork-Id: 9755577 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D1BD7601D2 for ; Tue, 30 May 2017 22:33:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5336283F5 for ; Tue, 30 May 2017 22:33:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B98122847F; Tue, 30 May 2017 22:33:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E1124283F5 for ; Tue, 30 May 2017 22:32:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3691A6E0E1; Tue, 30 May 2017 22:32:59 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 8185 seconds by postgrey-1.35 at gabe; Tue, 30 May 2017 22:32:57 UTC Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0044.outbound.protection.outlook.com [104.47.40.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id D9D506E0E1 for ; Tue, 30 May 2017 22:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ykjqDAyLeF75u/jYtjuB9hUu4WX5ogHYFjirGb+mDqE=; b=QGxowJQxcyOhCQjkvJyXzuDL+6SUZ6R8NHGPgdpNcdaCB9lqeB9mgj/UosVSRsWkphvEDKJaBYNoPmpUgV35/qK4r+oZ0qY/Gy3U0vTWE6fMSpz9i2UIw5g5SYd7Lc0eYkuVkGc2pXfCm6Zx2dQI6+9HXKxw0JLG1fult9epsiE= Received: from CY1PR12CA0048.namprd12.prod.outlook.com (2a01:111:e400:c42b::16) by DM2PR12MB0202.namprd12.prod.outlook.com (2a01:111:e400:50d0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Tue, 30 May 2017 20:01:55 +0000 Received: from BY2NAM03FT022.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by CY1PR12CA0048.outlook.office365.com (2a01:111:e400:c42b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Tue, 30 May 2017 20:01:55 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT022.mail.protection.outlook.com (10.152.84.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1101.12 via Frontend Transport; Tue, 30 May 2017 20:01:55 +0000 Received: from SATLEXDAG01.amd.com (10.181.40.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server (TLS) id 14.3.339.0; Tue, 30 May 2017 15:01:54 -0500 Received: from localhost.localdomain (10.180.168.240) by SATLEXDAG01.amd.com (10.181.40.3) with Microsoft SMTP Server id 14.3.339.0; Tue, 30 May 2017 16:01:53 -0400 From: Harry Wentland To: , Date: Tue, 30 May 2017 16:01:40 -0400 Message-ID: <20170530200140.25763-1-harry.wentland@amd.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39410400002)(39860400002)(39450400003)(39840400002)(39850400002)(39400400002)(2980300002)(428002)(189002)(199003)(38730400002)(5660300001)(48376002)(4326008)(50466002)(5003940100001)(53936002)(86362001)(72206003)(450100002)(49486002)(77096006)(230783001)(478600001)(106466001)(356003)(6666003)(305945005)(50986999)(33646002)(36756003)(101416001)(189998001)(47776003)(50226002)(105586002)(8936002)(81166006)(2906002)(1076002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0202; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT022; 1:xFmLNhkDJb8UMB3/tNikt4YJG3r48BP6PhnmsmqVG18TTUj8PcgxayZtN92WqYBYnww7roOycx/dmsia46fXVKpqBr0zbG3cycsECPI7z2cIIbPOnNGb/q0xh5ogjyxbHhGJXYd3P4EkAwH8iNxM2MVUv8boJzhqYNPdpA22skrrtodcXIZ5oTiZdSggcMIlvjxseMDJcvzvHUiBASCXXaKMU30xkqf4mhfXiSyibOChEJWGBeEAKiS/1qt0VhSOdnetf0d3Lov+ot7aPMs77a5abfIWDD04wsVvCccNOAbhQJhMKHLmSf95nCFuXP+SEJ/KlkQOSOvyQjqf8UNOsKUFC3M2Yy3BuNjUqsuzTv5eaX5zKXgy5r8st6QiDvHVcVEBSlVqcTGA7DnJchVBtV7HXeTx6JSi9IxhTRX5OU/hV0r+KuytM/3sJfNgGgNTmGB9PMB9rEft/Xp12Eixqw1WKuM58muEbwZcm53Ekn6r25IKMWyziqZx80D22vglMmr/hUuYtJEYEEr8oSna8Q== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM2PR12MB0202: X-MS-Office365-Filtering-Correlation-Id: a0090709-36f3-44be-63b7-08d4a796b8d1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:DM2PR12MB0202; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0202; 3:fEkGEQt1JnvnL2GMeIn0YUz8FLLIiIqCOI2OVPrcLjj12/WFOeM6g/sG/VhpBbd5Md1vh1b68KyHRWDhfdSHF5YX4XDze7NuYBxhgPLXLAPVXKjeqpXOYKdGjXQVXCYEeMgpcjd3pd1Cq26efkuc8QpmgszM6er1PMd9OgenvBdh0JD1aG8xhYOgz+44h1k5bBulvTjclY7sF95YPaAaasTHW95MGi9dpAm6+QLPt4lPeL0pY4ZBl2RkMtd7mUaLSYHeemns5b6loe+BI77Od/hPbBlIG+mTyus7IjdyZBe9G7iO5upuqp9iJ6AB90W99D48qDGXJ02PumCEGgqYfLIvhW0ctzn8Af6N7wI0nIonZyCoCIxlE5AyGiABFiH3WTSBOzGrfNraVXkNoCpg1/TJEBe8Lb0kuWlOLWg4184nZzN2F9RLed4IPE7ETfqXd8oVa+FAQbWa6dtbmCaG7A== X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0202; 25:8CSyHYGxag5WFTLpz8VZ4/fe5vEr9DR5EgMOEWFAiajEhnnH4s9daUYSFSk95VbJBmiNvtO21JbX4avDOTRcxg0eIlKJ3ZCCpvuOjPtKY+2CNK18tWfr7BSkQcakjpThHXTNfFKqajh9NgRYqhH//Kli6pzjJ1mdM1glVJmdnFkE3oA9Tmn2r+Fv5cTYtozws7nGvZqV1ykym/0vUCd3gLxvlFuqFhlCPcwTyQAJ8ZfaC2BvAyurEuy7zNn/X0TCgSqxMbppaZDG6L5s7S2PQwJay5aB6r9LN5xsr/r5trYcGh3F0yEg8m8Ll803VCqcrfLypOl/9Ml0BkS1pfIY+t5tBrWdcTt1eAjX0TyTCnCRDe+wDuVUjPV4FclPmkbNXPRx6imC6op8UXBpYqYa8YP72ioJzq7045i40/DJG/7S2oWr4cfxmoY3leL1g8cihNomhcT3XC+//D+4jCcKif9pKAcI5a22vTsp47lKiYE=; 31:hJ6xv/ufhwt1vTTMVsM5B0swRMk5hFyeuMRYQ8c9TziTSa+YK9n1ki5PwIrGwic0BzeMyXIV9MP1693DKUNCfqm1GWODUJG6REW6WuDk4JRtXyI6MnX/QORNzYNpMa97i/sEItETr6z7xdycisxOPmk8rOO6Sw4jD6mhTcLdU0PTJS2qf2SWM6GkGc+bfl23vyNyzc7Sgwcp8iUMpfSc5bTxd9Zu4VVx4xMYIRfGw0PGaKUrvJE+Z9o+3hu2pUPA X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0202; 20:4hm5kVnF7QgYHOQUVXGthG4KlIpM8r/JDIlSCW0Wx4u7mpyozDLsJD3wqih1/y1iSs0Myyxjg+oiuIb/kXv8qfWPO/VPB5URrv3YGB9Y1mPECgPuCS1KNyBrvnt4Qjh0eksjVnyG283yLL87bJqfM5uJTTI4pS7CAaodIoWJvgH0bmsqziddYk2FYgF+D1EC3FiavjHlBg8YZQyRPASvadFxMUw9cb7sx32sE0jr0kGc2mCahZAQbDcEa8NsbP9jp6dSlnO3wtArPI2tOho+t7uISxOoeUhpiEpq0Y5p6eQkaAGbqRUComnl8RyvIJRljlrK7a+DgS6Pcxw2SzLaduFCKdGy+fK7NZDNcIx//m8zXrvskwuboZJ45YKXTPi6uKSlFiKM1mQC9Q4O9I5vkCFjVdpgaXq/srUGVZ937YmyoTkblXZnt0vCkECyDsakeRg2vt6gzJR1SD6EF1Fh+5qSArNUoLfLVaCAeQEvhRxK+voer2qn4Kwmr+nhURel X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13018025)(13016025)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93003095)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123562025)(20161123560025)(6072148); SRVR:DM2PR12MB0202; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0202; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0202; 4:/VXv4L5GA8CfOG9Ee8Tg29VyHTXfn91DydpDwpXLL0KZtbf8IxJoZoHibApb8C5iKol+XjNhMYZ18q/Si8VLXdPcUYyc2n2Bgh35VRk3dziRBEqILn2LDReDyzH0QVF4f75Edn/OP5gryj5/B2vMXpbM0xzFJdh/LJPyK6Nw22pCVLOeQab3YMrDNjXq+Jz27RGLd62g6dfcTJ5AbEORoZgZ2araHJfgaLvzGm1S7e9muS/sIbzvurcmRRbXkIYnahMZC1t2H0rKqYoxNrclB4LiB16gHD3nIl3Nx0LhXec7WgdZ65PqPas2Sk6gaxyV3b+G/p+67Z+R39vbi2Sgh+NBB2fWnYmTT1c8EUCiKYZcH6bzlVQAQWd3btZlKPF1FoZABcq+5BwzadFoXMqyG6kgdTp2FPncO1BeXYCFJVRWtJlKKPW/wH4rZsp398LRBGZN6d+87Hqo7fiqLKcc00lL+MgRvWNVlgaPXG8XqRJVOorzoX2+20WDeT/9ADK4fPYRh9/UG4YG4zEs9RsK09GIzn2t3hT/dIUCfOS17rd4TGYjyerG1HBSGJTOQO2bzFPhouBbwXFd57dShFSBJEyXQ/abI2tiIbLLAcKurAH88Qv6bydH7gHYzMn00dtPk00vLRe+CAgsjxBk1/6bDd5KjmpeyHQdwsNupoNWwimrpOlvaYkBBnr86nO1DCmvixjXA7hbRrCqHjxb+ItJ4MZk/LGyH5MeIP4ZMWtLo0JZPfpPB5BkwTvihrHrPb4o/NeD1dooiOJ3rsd0sopBd8PKj6veCajz2IRQuKqqelnAug7aMUcb0veXJbKJmNeBZ2bVUwdS9XFWAr6AknXISoVcBcsfEh6CaR39/qPGQ02usuzrYf8v2RjarrKmE+wc X-Forefront-PRVS: 032334F434 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR12MB0202; 23:42YEcfxyycVXipq7J7UwEcHAkub55gz6F7Anf0nVY?= =?us-ascii?Q?hmqw9w6PIo56cKaEzFeLJ3F98Ingq0y+wXqbMGdT7JQA9OtK45cPHzt66rqM?= =?us-ascii?Q?V597RKPijBJ247fWQ7wJ9vW9R00yK1vsLxay2dXHoAJHukecdy8J6V+2jCx+?= =?us-ascii?Q?xOMuKNq4lbopAT5Y4Ug1tz5boMmAm95hhkbff/Dq+LAIlwcRr2TgGmyuIJkm?= =?us-ascii?Q?IoSLCt1GggDRe4injH8fZtKF40d7ym6suhftFvpCblUyWxTHCXQAfMi2OSWk?= =?us-ascii?Q?xRnTYytq2fI+mo7t2D7dBYWceulfkyXixfU1C8XOZvunEiUneheZVY/oaoRS?= =?us-ascii?Q?RHKZt8rjvIvIlb0R1t4EMvG71p22Him7hePxRHKtyacDu24jtJyf28te8KGM?= =?us-ascii?Q?68cTnaT5cZnSBl8uIoK2vbmRFpEeQSQ1TSWmFTfmH96soqn6W1QC2DX1oYOY?= =?us-ascii?Q?NBGTE5mIccBkF9obxYIO/X3fmENpaH+UUyUO9aNgoYyGiw4U/Szyz1W1bmnF?= =?us-ascii?Q?cQm/t6a9ZblohM1tItHx8Fdox/SHeiJMYEs5KuzoFYDtw8qyOQkYaW5buV7N?= =?us-ascii?Q?P3fArT0HeIunzPdGT7FB/VxtD1YsRivCeSOW+B7ow5r84tWpQyZ5T+7sQzCA?= =?us-ascii?Q?1DEl5BZPUKDjMwP/rafK2WBjMgTbILcBtRRsnfOA/qYktgEJKG/yL5EtgyYJ?= =?us-ascii?Q?h6Z7CM135CJmQV5jtGCCNXO2Izj0qlu/a7PVssTv+rw3TED1VnJ66eCg/0+5?= =?us-ascii?Q?h543R8I248VvFxmkHvCWRv52YckBJRzoQ2COAwYYl7+jYKkSvw49xBwUd+/o?= =?us-ascii?Q?g5TFaxbmIEZySSvvZyCPy5caF3StTu3WtI1gd6FoGCNLDNX197+zUxFGppGE?= =?us-ascii?Q?koK6SHdBuG/gEbsX0kD68kFXZtdVfmU28nlROemxvxd2gGVBGxohVPXclAPB?= =?us-ascii?Q?+F8y8xzjI7kfDcgdljEcA1+bf5b0Jk+fLG0sRwWSqP8tvNj2Vpk4tKxrLmQO?= =?us-ascii?Q?y1gYXC9YLWKgJtmTiGa28r8BTH4jc2o4RHtW79FCj4W7FksYc3939/hyjNbU?= =?us-ascii?Q?9VDrUQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0202; 6:7RHAAYLEp7vX6o6+ZhN1H3pea0Z7n7P1YCAahd1+2JdDEpKDq0lMyuNeMAsa88rIoH0l2xb4SDbSO8G2CsKlgsjIEl5D+0nm6yOTeY1hao6pnwMJTVJ3XD3Ee2m8pwJ8hdZMuUhcwHR/X6rfpYSh5YNiXbgY5KRTcrvtgDCbJGXUjiTiSQ6xPOFNnobks76u7LS5O0H/JES9MQMMZazQK/6tzdnagsg288ReNl6OnvvKhP7y4anE6mzUX8pRtTiv9aYqmgMm7tZQaGObsk7oMUrxst1PlTL0fmOxmFmjL6qC9iKegna/o0adDluCywBWoDEDfKtL72qTEVfeEwszdloTX3sH3jO1SkBW8BqFE5hybQQh06IvqJ6NpVi/htDR/hCGPDvj+uOdJeqEpoYajBnLIXAzda2Ep0k78eoIrm+0ATJ1Ew9K7iWeW4lw72AuAJ+Cu8WQBmKzsNSEPn+lzBQntvalSQnpg9zadt2nxfXwfu6jPeifj353/qoJQQO9lSRVwpwANEKDB3P3DiHWLAQssshGyXsqA0zu5UgIECM=; 5:Lz6nEZU2YcmKxlSbSfwLI7D2UXzdRt+WNXU3WFUdrgvLZHqRMYY2YoBEXGo2W4wW6FypjFGIqSN5bP9BRxnsDOLXjwFGuexqzEhctP/Ex035KED8yvl+BmmoR9k7Ap5ryPAznOJ+z/ggcV90UV0Geg==; 24:1RV9F3j0o4wUi5AP359gQJkaAka1fuYZ9Jd5U8v3+G+DZOyTV21Nk/IhwR5Q/YEK6zz5+IRoW3hdxruD7+jS0+dPY2EXA/vqEXCQ4/IXbMw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0202; 7:VnCFVeba5wZgJYHc9S5JGCvXNTyjwAsazK1DV/Mj1YQF9JRMCfd4J1R0Pkj+wU0PetlPd1UzQIz5iNNbOBf0CTBLfdcF9UeOf72th2p9kpAjXzK6HeRUJ6tYgkVXjLlZQSUt3i2jQwdoITNNPPjRo1OwCJiAUiR0P/e+QBe05Gmon2Z5Nu8Xy82k7y3P2iw2AlSUrLbA0X+FleMzwb7ijrhoxjv48xZpJaa2dfQxeZyQl7lYt0sSwujoBa3E71bywAcXBXyRzSdnM7JC96eg7oLC7P4Wmks45uwMAGzVC4HJMUnGQyeH5ncZ2oWWm6P2bN3mhyLgtECwNDW4s7OPJQ==; 20:yQQvrOxIOYv6k7QAQKCdty2ksnDlY/LFSVV7k2MuO0FXfhHxYLeUelU/EROqAAUZPOyiJfIGGx0hu6jYORjC38dhhdOuOTXSvIY1yqzzzrl2Hc0eusNOM+UeMQ0tDnATTpqK7Zkd1qi0b6tUob4ZZNWTTrH3veTmImHpZObKwrNvBjbEa21PNlLN56YDWelLoLlx+4jT23Ey7X1LzQFUYC+IX5EHfsg5+qPy1cX/+mMnjdXsxmcK3k94HWcriFXC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2017 20:01:55.1714 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0202 Cc: Harry Wentland Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_setmode: increase MAX_CRTCS to 6 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP AMD GPUs can have 6 CRTCs. This requires us to allocate the combinations on the heap. Signed-off-by: Harry Wentland --- tests/kms_setmode.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 430568a1c24e..847ad650d27f 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -35,11 +35,13 @@ #include "intel_bufmgr.h" #define MAX_CONNECTORS 10 -#define MAX_CRTCS 3 +#define MAX_CRTCS 6 /* max combinations with repetitions */ +/* MAX_CONNECTORS ^ MAX_CRTCS */ +/* TODO should really be MAX_CONNECTORS ^ MAX_CONNECTORS ??? */ #define MAX_COMBINATION_COUNT \ - (MAX_CONNECTORS * MAX_CONNECTORS * MAX_CONNECTORS) + (MAX_CONNECTORS * MAX_CONNECTORS * MAX_CONNECTORS * MAX_CONNECTORS * MAX_CONNECTORS * MAX_CONNECTORS) #define MAX_COMBINATION_ELEMS MAX_CRTCS static int drm_fd; @@ -743,22 +745,25 @@ static void get_combinations(int n, int k, bool allow_repetitions, static void test_combinations(const struct test_config *tconf, int connector_count) { - struct combination_set connector_combs; - struct combination_set crtc_combs; + struct combination_set *connector_combs; + struct combination_set *crtc_combs; struct connector_config *cconfs; int i; if (connector_count > 2 && (tconf->flags & TEST_STEALING)) return; + connector_combs = malloc(sizeof(*connector_combs)); + crtc_combs = malloc(sizeof(*crtc_combs)); + get_combinations(tconf->resources->count_connectors, connector_count, - false, &connector_combs); + false, connector_combs); get_combinations(tconf->resources->count_crtcs, connector_count, - true, &crtc_combs); + true, crtc_combs); igt_info("Testing: %s %d connector combinations\n", tconf->name, connector_count); - for (i = 0; i < connector_combs.count; i++) { + for (i = 0; i < connector_combs->count; i++) { int *connector_idxs; int ret; int j; @@ -766,14 +771,14 @@ static void test_combinations(const struct test_config *tconf, cconfs = malloc(sizeof(*cconfs) * connector_count); igt_assert(cconfs); - connector_idxs = &connector_combs.items[i].elems[0]; + connector_idxs = &connector_combs->items[i].elems[0]; ret = get_connectors(tconf->resources, connector_idxs, connector_count, cconfs); if (ret < 0) goto free_cconfs; - for (j = 0; j < crtc_combs.count; j++) { - int *crtc_idxs = &crtc_combs.items[j].elems[0]; + for (j = 0; j < crtc_combs->count; j++) { + int *crtc_idxs = &crtc_combs->items[j].elems[0]; ret = assign_crtc_to_connectors(tconf, crtc_idxs, connector_count, cconfs);