From patchwork Fri Jan 26 15:34:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru-Cosmin Gheorghe X-Patchwork-Id: 10186625 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 A5AFE60383 for ; Fri, 26 Jan 2018 16:55:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F161285D8 for ; Fri, 26 Jan 2018 16:55:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EFAB29E72; Fri, 26 Jan 2018 15:35:32 +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 EE1F1298DB for ; Fri, 26 Jan 2018 15:35:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BCE16E2C9; Fri, 26 Jan 2018 15:35:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0069.outbound.protection.outlook.com [104.47.1.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B8006E2A5 for ; Fri, 26 Jan 2018 15:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=wxHPahWsxbiIYMvj3m+I3Qhz1OE3uSKYbqalNtcFfEw=; b=GfBeKu7MJLWNyAXBMJ0RGydjSwud/+op7VLNyA6T9iy6khWIovIw5+2uoI7UqONLxpBJ7UhzOBerS2fPTKnIPUqZrDKq68PSMN1KoC/oaaahmSXz5YbRXEJtCkpoe1ElODVXEfRik4XIdnqGwOb0H95BtAKc09DmieQIEQ8F4Bk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alexandru-Cosmin.Gheorghe@arm.com; Received: from e114479-lin.cambridge.arm.com (217.140.96.140) by DB6PR0801MB1253.eurprd08.prod.outlook.com (2603:10a6:4:a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Fri, 26 Jan 2018 15:35:25 +0000 From: Alexandru Gheorghe To: dri-devel@lists.freedesktop.org Subject: [PATCH hwc v1] drm_hwcomposer: Ignore unknown connector types Date: Fri, 26 Jan 2018 15:34:41 +0000 Message-Id: <1516980881-1098-1-git-send-email-Alexandru-Cosmin.Gheorghe@arm.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [217.140.96.140] X-ClientProxiedBy: LNXP265CA0043.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5c::31) To DB6PR0801MB1253.eurprd08.prod.outlook.com (2603:10a6:4:a::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5dba5dcd-9755-454c-729a-08d564d26b93 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR0801MB1253; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1253; 3:dtZPKZmebWjFl3l+aOpbY7FySjv/3bPa+ltPXJZrNlg0qUy8j7f1PJytJS9RpNklsatoBmbRk3DKiqWP1N1ssheeEERgoQhj0VVjGIjPEKr0h75nVFDvUYfGp2zHPBeVmOo/IFHXBs8imI3LfPdHfAEoA4v9+pWuXsAZkl7n94awMXkn5NQJgnZ80yzrdUqlalUBXHIdJHW+zgZVZ5YwF13atzblCzTMpcf+Q8+WhWtw1rB3D52hMEsWOCeMZFRW; 25:evaaC6zgjjfiIydt0XAerWIyxgNkCzn2kzH+KrZGGnlsWc0Ru9bUTXyb0bAzER47mlSbHuidVWS5J0drqklm5Evf/kZ/3Lp1nfQbQc626elivmQDunuMAXn1SOP7Ip0nwFI/V6/7e7lRM7HFkBexlOdLkMoIldtStAaEYjCs1PWsiJRatbgEqf3TucdM9dCUBFZb7xN06DfETIQWQAePZHusH29Y6Y3oBu8te1xXXh3uVypj5Tgzy4O88IGODd0K3fLGSJF6iTbWTK0UKHN8TtKGwvK/1rh8pzaB+04spEIaiejliwUBasyc/Ic8kptOGDYMzfUUJ/DfsI64sFWNYQ==; 31:Q3WJcnR6czRU7NvqzEGjatSWxuJnC9c5Wiv/cN9ANxRGsXIgXanM/GoJzf40eoR4wbDhPP+Se9aGjh2CCWVhV+O+GF5K4GHsHcFChvm1uYcfFUQu5yzNqkNIxQM2Hc+VKTOedkVQhmxquK83TYEerC448Hiots40vOR3+bfXX1qWMIZS4yyrPSv/iHfrRX8ptgrE3rIM/v9ZFY1Xxo6ArzdzIT/jtGq68yWxmwR3J7Q= X-MS-TrafficTypeDiagnostic: DB6PR0801MB1253: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1253; 20:e8BCEdSAef3r6GKBGhxgUbcsjONEa6y6zzmcz65xl8ykdEZXlgSb1lsdo88N0kVBzlWatvYqwWXf+hJu63c2yBPEw3ffujNGvi50Bwoh6MPBgckD5pmAtlASvFIMgyCXfPbNnVuVkCNtv9HIAF5U0VLIp6ainKOMClfIfs5pDrs=; 4:Q8vusPNapDi9LFHsJSZLb47n12zfmkuzt8S+2GQaKcynR6ei+RSE1NFYvFEA0N19Zp7eOL+CYvAD6KOgsUG/kVzCahT96TykzOk6aS/ai4Q5NK9UldtE7hC5ptU7DgLqgEmiYeXvYChk/RHjhIx0Q/4CDd12mXwfiXqMD7LOnTOj2emeFeglN11oweJTqFu+b3deCVVKPgDAI6iGAqEuBz8EBK6rdAIy9pj4kpV9NElLDM561xPhG8FkPX/WXDZKJis+SCMotcnFe2iBNiWIn5TcJGh3kg3dBmYEhEAByb1bSaf7/eQafsrWX2KB1c++ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231073)(2400081)(944501161)(93006095)(93001095)(3002001)(6055026)(6041288)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DB6PR0801MB1253; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB1253; X-Forefront-PRVS: 05641FD966 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39850400004)(39380400002)(396003)(376002)(366004)(346002)(189003)(199004)(6306002)(6486002)(3846002)(6116002)(48376002)(50466002)(53936002)(2906002)(106356001)(2361001)(2351001)(105586002)(305945005)(7736002)(7696005)(386003)(66066001)(966005)(47776003)(8936002)(6916009)(81166006)(81156014)(50226002)(72206003)(86362001)(8676002)(25786009)(68736007)(478600001)(4326008)(6666003)(97736004)(16526019)(26005)(36756003)(51416003)(186003)(52116002)(316002)(5660300001)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0801MB1253; H:e114479-lin.cambridge.arm.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0801MB1253; 23:P7iFnsVMoG0pYmt9ZdkBC5sYOtLZws2p6czQSbx?= =?us-ascii?Q?x/Op+N1uh/vnux+wF+k9DX8m0JzzOeow00/IKYEtfU7lBa7eeCVFE+fa9wsz?= =?us-ascii?Q?CIagWjdDU2YtkyOMCNbij/UVgwTp+4cffXJMC1hE7mn40Qx68zCBDeNijN64?= =?us-ascii?Q?dr2/id3/j4s1jThhO0g3zxggWw+jqRmZ4xXKzZG678d1YqN+TjsXmUM4eTUx?= =?us-ascii?Q?6ruOYt79D3gP4U/HLphZISlL8AZyN8uXdV5DbJ43GD7RFFPheHHg+9VuTSbC?= =?us-ascii?Q?a45ZT5EhB39YC+E/LssSIW5aR+Wta4tej7Os5v6LeITZVOdYjrv3RHIeun5b?= =?us-ascii?Q?ZpFWPfmhOX/mIyci2WeAnv+ITNwbVuGz2iVzSbvpNwxhfsu7MUfe+aZXRRfw?= =?us-ascii?Q?BOPgy9eGXRRK03gj7Snu3mkwi7qwIgkNLYYfnkkehVNdM5cvE6fSMTc8eBnI?= =?us-ascii?Q?L6ZHfw0T3CwN5hzEmK43AsFCNckdd/DpSHCrI4w4IrX3GF2cxun1j5luQV9x?= =?us-ascii?Q?zR7JW8BBQ/MaAP1VpB5UL7UEptpWy1VoeMepDpbsFYDQOXqtda3cQIBB+fP2?= =?us-ascii?Q?qwTwAZxfXp/yFLlFi4161DnIMNE9mLsIcafX7nj8W1Hj1fiw1254otHbBFwo?= =?us-ascii?Q?0LZyH5xDbnCHPH6gyhKU58OY556CaunfhilCf6E+Tw5FQ1j8dHPfbixSK+t8?= =?us-ascii?Q?Lgk/mz+YMaAKPIjR0C/AZr5uEgcZwUBr7mzEC9A3VFQAPJgYE4nYmLkWLtZY?= =?us-ascii?Q?n3TZcqM/WbCdVhu5HwBr4XdNeVRgquJgwzMAnvy9YCVyr6g53scq8FhBEshk?= =?us-ascii?Q?4YNMMpAKrcylmmjbc4olYlDfiDkPHl3laAjfXEOxyxoC3rl9yXXJz4rXjPIZ?= =?us-ascii?Q?cltmLAWlvY5s2VxH5Za6iDeSWPlwCX55hJ8ABVWg7Nk/uKApGeT3s7XQYiTS?= =?us-ascii?Q?KPU+gRwKN4lfEc5HZmIWCctNhGhODBHK3CcCIhXar/t4izztXv3IRtqO6sE2?= =?us-ascii?Q?xLoZFMCU09dEKCxpvAHFWq1xFkHbx/zLirqVbM5yXriHnZlHQLY7wQ3qyfMW?= =?us-ascii?Q?3+qGyybE+loGsLDeEroEtdBzWRBqY3ZB9Xk9QI6GPd8Zp1ZvRP2Qs/nGSMj8?= =?us-ascii?Q?e8IzHjHmIzyE=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1253; 6:MZeD/7yzJ6OPMw2ZTULepQecUmWYCzERwCPnstgEdBbuxIZcq2HbJcNbO6gxj0gLilGdYYEyQvbSuZyNWUkTzxb7O5YztuWsHD2i08lR7Ou8JUWzedDxrTeFErONAEA6YK5WFMHIqqqdJ4x3l+TETa3Lr50Czh/D++sdTK0WRgKD6K1qoc5QYjYEj/YpSrZnTfORDPU6bE+FX539siqsYJZzd2yhyHpnXR621dGlrHeE+vKxU+fd4N+aOzv8Q/Ml5DApWWE5HvqiEsy2ULPFWPerHqDhqc6M5BLWSqqJc92hro1NrNSCu4dhEMiHM7c4bXqk0gwfsE90p36zKtVY7U73B8RaM0Z/7/ejl7SJb2k=; 5:X4HjkvHBiWjJ/n2a0mU/2BPemF07vQP5ysCx4ANEUBpb1YECstXds0MyMZFvrEV5yhG2eGmAF0iHrLkaEqFRNvJxMfIMS3FnzsktHxbhRRMWhmq7Rel69+eGjvS/NPX6oJxahLyUSNhxkWZ8txX4NCKL35NDMDe/nTsV7gq7IoM=; 24:MRnN1a8zbtDljiJa/hiPEhhmioUuv85CCPHrtc+EXqoPSW/Cf/a0A+rDmd8+zSE6y5hjeTq1FcAxwm0t7d5kADoM0+/W5USyBmppljG7DGU=; 7:ivkofqrIUFkCzTOSXM6Q1pDMrzapLbrNi5FmXxJ5jBU7ZzlVraumOwjREdPWTWs0niwHNEZMbxz7AX4xzR8S5dWeNt1xFAY9Z2Q2cWbxTJ6sLp3JoBGI7lm8Ho0rwZEmV9/ou5gTmb+o6FoFugTU2aZaVAIdvkyBLdFnRL/1x4wPYSUfIZkkBXEI7rkeDlSVM1uer8gf4USW3o9sgkbql96w6J2P96/lT3SsViNauNuncnR7RhKBg48QOsOGtJEE SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2018 15:35:25.1965 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5dba5dcd-9755-454c-729a-08d564d26b93 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1253 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nd@arm.com, liviu.dudau@arm.com, Alexandru Gheorghe Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_hwcomposer splits the connectors in two categories: internal and external, the other ones just fall through the cracks a break things down the line. Found this issue on mali-dp with the writeback connector patches from [1]. [1] https://patchwork.kernel.org/patch/9727637/ Signed-off-by: Alexandru Gheorghe --- drmresources.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drmresources.cpp b/drmresources.cpp index 32dd376..d582b3a 100644 --- a/drmresources.cpp +++ b/drmresources.cpp @@ -153,8 +153,8 @@ int DrmResources::Init() { ALOGE("Init connector %d failed", res->connectors[i]); break; } - - connectors_.emplace_back(std::move(conn)); + if (conn->valid_type()) + connectors_.emplace_back(std::move(conn)); } // First look for primary amongst internal connectors