From patchwork Tue May 30 20:51:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Wentland X-Patchwork-Id: 9755247 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 C58C7602F0 for ; Tue, 30 May 2017 21:25:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B558527EE2 for ; Tue, 30 May 2017 21:25:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7A96283C3; Tue, 30 May 2017 21:25:03 +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 D088F27EE2 for ; Tue, 30 May 2017 21:25:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 687D4898CC; Tue, 30 May 2017 21:25:02 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 1071 seconds by postgrey-1.35 at gabe; Tue, 30 May 2017 21:25:00 UTC Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0063.outbound.protection.outlook.com [104.47.42.63]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DFCE898CC for ; Tue, 30 May 2017 21:25:00 +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=M/zPzXLgk2rlSU06JvclfJbQgvt8ERsbXqmGvCVZ4XA=; b=iNsqhHmjbsKLbHfYANGaSKxMF/RLXBY6kmIcrmu54sNzLSHSW9nTvYYJKk83sXMd6Gk045ze2R9gZc9RAAVyz1l/SLf9Suqp79VuU3DxfckxxwAU7r1fUGhA6qZd9x4tUZbUZqe2HDmPVd8hFVaG7CujsSgy6gbA6fRMN0FLxi0= Received: from MWHPR12CA0041.namprd12.prod.outlook.com (10.172.49.27) by SN1PR12MB0207.namprd12.prod.outlook.com (10.162.3.16) 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:51:17 +0000 Received: from CO1NAM03FT014.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::200) by MWHPR12CA0041.outlook.office365.com (2603:10b6:301:2::27) 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:51:17 +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 SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT014.mail.protection.outlook.com (10.152.80.101) 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:51:16 +0000 Received: from SATLEXDAG04.amd.com (10.181.40.9) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server (TLS) id 14.3.339.0; Tue, 30 May 2017 15:51:15 -0500 Received: from localhost.localdomain (10.180.168.240) by satlexdag04.amd.com (10.181.40.9) with Microsoft SMTP Server id 14.3.339.0; Tue, 30 May 2017 16:51:14 -0400 From: Harry Wentland To: , , Date: Tue, 30 May 2017 16:51:11 -0400 Message-ID: <20170530205111.1796-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)(39450400003)(39840400002)(39860400002)(39410400002)(39400400002)(39850400002)(2980300002)(428002)(199003)(189002)(5660300001)(2201001)(450100002)(33646002)(478600001)(50226002)(72206003)(36756003)(86362001)(189998001)(356003)(49486002)(305945005)(48376002)(38730400002)(4326008)(47776003)(2906002)(230783001)(8936002)(50466002)(106466001)(50986999)(1076002)(105586002)(101416001)(53936002)(77096006)(6666003)(5003940100001)(81166006)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0207; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT014; 1:d3jkQtIpMaQ7sOotWvvOEQH+46kvUIv66KjJp2pVOLQZ4yk333nEop1pWPbBVtxkMqjtW+60Zdl/aHCUIva2G4ZqghJ5OLr62YqRZS3w9Rw8mzpZ94Xc5T7PplksSWtiPSAvLJgAR9ExyhqGNHLx604GG/IxOy9pIexyirhsK2mMdEDAIEjNYgmgqlROpi8fa/TiLBg8udUcG7m+AjuyUvnA4LlyZcVT6OL1/i+lp0iW/y3QbRg87ACIIMTUuwVsmVexHMrdnxb6fiXztHIyfq5aawEp8tIDVWF4xuQx3P1z/dTA2/qmWa0P9/mIsHOqVRQkkLnjNI5RNFIXL1fM6jAfukCe1ULKAkGD609s+uHz1TG6XL0m4mDCXqi2TE81SFbSXIpRVDfXOFvoK29t1m3PGr2KLPIdQZfPG0ZPjq89puiaQ6YJmwmmfvtL/KWSq8HCKjfo0+MHIFrqB2KAAgXCyYT+n7HgpnEsZjl/a6Geh/hs1NxtXp9JSF/FAmiVIxZbmBZP9vTh04SzWDHZtPg/qAeHh43jEchXdsYMzwI= X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PR12MB0207: X-MS-Office365-Filtering-Correlation-Id: d119a55d-18b5-4d6d-df36-08d4a79d9e20 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:SN1PR12MB0207; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0207; 3:Yrm5uY+O1jt2XDIAxuMNpNHfBCpfDT4OYpCoNBye04dSKjzbayGQUMk1iGmplh6X78ZD6/O+5AwHxTC5q5YFgDDf2NO5z7Odrf6QZSiL8DsLDvrXEcKbtNj+B0vZWcx4dzSq5Gu0YOavSMfSKwrTQ7e18hgmmeFFVWWW9imBaT5z+Z/AErZwzHEU7daGhX1eMUmXgHQse+0cgr32fa9uUicERPB4s8SD9BaTeNoFyGHNTD0pSoDW2Oi6rscUnlcyGitslbrV2Ats6YsiJPhtOS1QYjHN1mbgoAWYQf1Rqfvl8N5plPnGakNEd6iJaWzQTSau8fUh7yXlDDBKjD0XP59ZQ+A76MqAJIQbpiEC6IV/ckP89h23XS/qMQbYhci03BCI8IwHgT1o00JeM51n8HJe37b95UcHAMZOxwEF3c8JW45TZI22N8ZNQY49YqbRMPvoNs77CmnH57jNGm+a0g== X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0207; 25:VVRvdQgMsKG1Ow32/7ATKirDqNDYfm10nyZFMiePj0eEWnPMkrHzZ4SNR9lASHBLvmL71iYz+zwjmE9cyCo8VzELPqTsCi+ZqMVrIpm+5HwbISVwHEBr+hfLtAgdNpOOHERgjIxHdc2CYXe2eqJ3laO/x2IpzsO2Ar8mwfShiAgrLd30RWVAKeWg+mPvulKl+wX175OHSL6OQdtLz+Twx/w8n1gVveBsVIO6nIrnUmePpOcVL+h0FCR5HLYAElt3yZbxMhd+m062VlnBgdHmkd+XlqbHfLl7X+eeltklWXNz/UtDIJCI1N5XoLNknP80uwSKHJ4/WLfzvnCSXjSKjQcYN9pcNY2XG5feFXxXNjX/dLZPvsBCPKnXo0FXJWgo8kHZUU8VGM00+sPzRLahhy5ZepPkoog9hnLC4LuAw6Qrbtgsiv3DJDTNCcaDLKx+DIqBUVN4ApeYcj8dwc2i7YenqNwVKW1ennTb/mi0uhY=; 31:uyHbrlMoIf5M5la4duVaJVm0csFwUH3Mfwnb7/ongQLN7ozUmgCkJzP7Ba4E7ztpgPc7B8nnhWXwwaXs/rhSb7qR1mijIwVSax8uK36WI8JD3Ym5AhZ4CAmE4G4o8Iert60fiw94UGf497oWFMTG6tpqVt87P580Brn0LhowfgdjceFqqn/8kQ5TpKHpeRX2JnKkvQ3K8NJqeCZE+bglBu2mE8cy+dlCOUugLyXAFZLZqbExvSD51JqpPIZT6flcBy+ltb+6f/8/Jiul5SZSZw== X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0207; 20:4p7NgXYmlWzCkmFc24k5T5v1B6jyEAP/HxVgUoCJsW7OE8jFcBPsdZnUhHdn/WIcKXKD8AtPHJn/7hnUysgEmkHgfWSIvJGYeUsM5a5NbDL0k6YpYXzQDcIsgBY2K1DaGOFFpsr+TP0Cq6CUquCjp3ddRdbVwE19/LVtORr/B0IZbhgPUsHEi/xjBP409XN+cHSptDTP4l4AjL8o6lEmpJ1i9T/BB4spUFy8eb64UGYH6rszu4lC6uWAbkkpb89GJwdtJn7FWyjTg2/tKcT14BHTRDuh1eL9EVczaBRHH5Fb5JJ8fRAo0Ig7T/pcE/qu+dtvnHt/F5nSNitubbCMduPZglq93ryOCKBRKD2VwXdCDR6PRP+WLX5Z4whoM7uBG+CE5+jKc9jr8aVivvwQ+u4SiG1S4OpCtt6A09Ttnm9uQVRJj+1UYM3XQ7uuOIzRCwZ+HF7Ebotvy1GFyZ/wGWFfZbqsCovALL+qraJgDjLAu53gPt4OD99baFOFdBc/ 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)(8121501046)(5005006)(13018025)(13016025)(93006095)(93003095)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148); SRVR:SN1PR12MB0207; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0207; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0207; 4:Qkpc6eSw9VyUOic6KsjwzQSUr8++kiEBMZLFyaLdZno1YDKtegKYevYOOl+JygmTzqQUOZdh5Doh6yxOQ765spdIfFXKz/wfW6n3+jouo1DkOZNEx6l2//bJeh5KJpA8tdIGN2ySi3OZFH5qYZD9PQSp9+0IQx8wcYPoSljYsUKvnkaGdgM4Q7mWx04wE2LbgYuhBqXbB34S/U9Gu9pUI4fXJiTJsrG0LBmpisYH7CrzgRE5UGd+mxwhGwz7sxF41vvsQm3uUE8f2a0pFQIa3LnGf/q7iTQ3up7mvJ++mRotW4kPzEM6U3qhuSIX+2KHP99Xh/+a0Gve8KK4Mow4wBD8qxKOBtIHzDwcuz8nlfLxevgNu61p2KiDB1MrIKZJw5S2KfIVYR6sLmchnGE3e9QjnWkhvugMG9fmCz8ZPqwgKFU5di2i9pJYtlDh6jGpW5MbYTxNuOPSMYlTgnQAStnFxaHsg/UiWcpfqCTgThk+QklFDqO8cRhWoIs9fRmmlTzEaFg0rJw8VMKLNYyv5fCpUTYWJcZfhMvlrv1ogxQRKUTg1x3FVsKNxmj5aiCO8JGElOceL1jon12MoFZ0peqsRCXbk4T/TKcTVih60Y1ecSOz3qMGqG3ylD7Kteh071LSJgfFn2+RJ1B2VYExpJPFtLS8heSsgOfidGHBG3KRSwVwNt/XUbdZ8LdxpNe+U6Yh+pr4viBeJvWKBRyYUbw9HQnYVTl6OVHNvl7TsaaBeerHfm9iX4dE9f8lv494DwKt16eF0RaPKee1tf/nGiHfjVCt7jDPlHbM9MQdgGSdzlI3yYyTSczY0I7KuP5dVGStaf2FbKDnI9Kbkz3qVvhy8PBr1D1Jc8kxEi4t0jHixMjW8yX2pYmRyni6Cmrs X-Forefront-PRVS: 032334F434 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0207; 23:9cMz6ipxwO0fHqsAva3x2uihfVaSj4YeVJ1FHi0yX?= =?us-ascii?Q?NPJvQBskuaA1+rjsfgbQ6VKMOLcCmrS25eIjdcWMi7XeEhDftlzWz45UkIKg?= =?us-ascii?Q?FKUNUaaSt8z0w0X8ei2swm3/dq8gox7uwOs8wMyZAO71mU+3y0CjNSYxHqzn?= =?us-ascii?Q?6JopxqHAefY25S2wXKffM6sW21i9Kw9rfxigb3hqxUJcXsDRjaNVjpUFGN+4?= =?us-ascii?Q?dfq5TUhrXXkhV0ZSokS7Cd+YvTgmCZsSUXjG4xQ3iH5Hc1l2NCSlZZ0IAzYU?= =?us-ascii?Q?92DAPav4Y5T4+/nw57dOqs9A2lEdVv5enGBTT1yA7vwlws6zfKo40n1PRAq8?= =?us-ascii?Q?50OPOBx/Z2FX0Uf6kuiS7ROvvhwG2lxONo9mq5lEQfwWf3GsW9DuVgGUtnJG?= =?us-ascii?Q?ZAqfH1MWNNlyLxXx1MLq+4y9m4RvRnSzBu24/TCZkkIwWcY75FR7qSeVt1O3?= =?us-ascii?Q?97fTnGfw6VSWHRNBVmD4nxXw0quz5cQaN6vW7WHuIiuDVxEhlDmwHXFW60Fx?= =?us-ascii?Q?qK8yvQpfqNjnVoH7nRHkUwrY8MRfJyZFAr+hhAP020GGUTE7hvT8G8NrgwRO?= =?us-ascii?Q?SuBxNkA4Q2p9XjsirMg7HJ+YXQJE7yUFqPebygGwdRxPA2QFsmuXggs0zAG2?= =?us-ascii?Q?+8P4zeUt5EwLj6rvzGe2n0Z5zYKJN/vlL7cguR9pMJQg9SkKqLFdw5djjcH9?= =?us-ascii?Q?FzpVXlXqeYQLda246KwJeMGGvY/Mmuc5uUmkCIiNuHpfjjBYdIo28FWVIwsb?= =?us-ascii?Q?+RFaAPP7yPPRYwyy+mqliAZzdyW2xKiMD6MTXySREWBSa64Mel1Wr3a2j9NE?= =?us-ascii?Q?8BhCzN+AZplP4hBPV+9kJ0SSJR8z2qIeq23SfL/9tcCFxlXy1HUdl+Gw1wSK?= =?us-ascii?Q?ki8jPrvCVXG4UQqOSjFkD/BeBSU7dYQx2Jy08vlzcKKosoZAcrULLnS3y+1/?= =?us-ascii?Q?ozgIyImDRebwW28DE4+bvH6iMeYcOLxRKQeoTTtNkEFEs5mZ5GwKWu/WFC4q?= =?us-ascii?Q?y2JJFGjwTNOo0gFbOhhL6zXJ02JjG/EDa7/eTiDOhbMflGeEkLhum+9UOabC?= =?us-ascii?Q?JbZ0GK+RArwNJ3ri+m23PCqY/wA?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0207; 6:yuFLw428+FpV7Sx/xEZV4SLCibdCqxQRqsOFCvr8BIaAqOxQHfBJKGRN3AhjkFOPerLYCQtiI4AAenNr6cuqZb6IZ1G0EfS3S3h4XwV6OjXIAzL3wOP19Mii5JtvxV4J2yODtwC1sZZXq2SilKozW49275i0GbZZQDbL020eZFbbF0smtDO40NF4Ebc1HqiHT0YA31z7tbyqnApV6FasjC7lz2+wWn3GQaWO0ZcjseN69GX9pFJgiWlMWXNLIei8BmC8S/hmWI5JPRD23xGgray5Ej2t+QtX/UzZp/1Imnq95IDd6Ub0LyGnYTlilbjTiF9ScCP0RAKDaK2kHqDupeYXQfOLhggibGNf21MaN+co1FGg7Vv/e41j4JcHFl0ZgoUlV755lps58fu5jyCTlk/v5nqkjoi4a8QCJ2K9NZis8E1e5jwSeZYafVSOXXFOmh7wdX7rv1VhLcmGrU2VKHZCD/CXjvVPUXH4o0kmWz0MRptW89yOf7SVD1GJHP5BErvDMfwaLtYH7FzX8YAbyfgN2YcjBdLySUG4WANMDQo=; 5:toYJRQjzRA5pq4YrbWVra0IkbTBdUppLM1fXviYhGidWYivIVXzcO6cnhdz264L6KkHEK+7poZgaTdxdIrHs1UL5DWYX6n5R21SYDSjRJYmpTX9Vu/3bDUQly033viSdlCFJYabP/vZS6i81OdAH7Q==; 24:sS6pHmEGgbKpepv0ob+88Zu5sCRf1yu8fi/II0r7XdJ+dzZMbWG0BN+XjcoKOEiM+FpoprwyBeU6itc6w45VL+2CGGUgo4VNuZjt8naDlZ8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0207; 7:hhY2ATJCN6tsxnXLamT/NFPkD292RbzUjc79MQLaM93EmS4dUuqkdYqqeSlM9pVWA0XPtPzlZ5DcpFM+DYccXHGEwYS/65BfY/lI6AGBPQ4OCfxiCcVmGV4PPZ83NmkKjixhNWuGS4js/5r8Zs12aKVpizWmKBXcX5H34GQxrgwOidkunjVkOjS2PbiFwL58rb7SybnYrG+uIN1RAYvtvKFL74Nbfgh1Yt2KB4UKA8MoMxsCWwThuiZvtblp6CoaRio8IRKmpY94tEEozkOSaLGHEVm8JHCzhv5XZPngyiccO5XNBKHvlgi6IM6wpwx4lxbqS4yJhk5P1oqIOeRDoQ==; 20:XeKVPx/45g8E/yNZuS/2IUtEStHNf+YhdyopkD6B1MzbhixGY0dpZf06GhBVXRt9UNJahTfc3qxnkvdDfN7ui7OkeT2dzE3JzNlMzfCahz6ZTTWzr/FijVSRQG4j3YsMEsyaabA4GcR6/JOEBIwruZj5RGud3SfG1/F0FsO/eBmk+PXA/MpXaLC8kuYMmNWTY2mRU6H4ALYPorvSe6p3p3AUngZfJDhbjW/9z3P06gaI5QLHNznYdWexh5PzT+7a X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2017 20:51:16.8397 (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=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0207 Cc: Harry Wentland Subject: [Intel-gfx] [PATCH i-g-t v2] 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. v2: Of course We should free the new allocation. Thanks, Alex. Signed-off-by: Harry Wentland --- tests/kms_setmode.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 430568a1c24e..62905ec27e80 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); @@ -787,6 +792,9 @@ static void test_combinations(const struct test_config *tconf, free_cconfs: free(cconfs); } + + free(connector_combs); + free(crtc_combs); } static void run_test(const struct test_config *tconf)