From patchwork Wed Apr 11 15:22:25 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: 10335709 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 26A726053B for ; Wed, 11 Apr 2018 15:24:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A05C2897C for ; Wed, 11 Apr 2018 15:24:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D82128980; Wed, 11 Apr 2018 15:24:21 +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=-5.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, 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 9C5742897C for ; Wed, 11 Apr 2018 15:24:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9160B6E6AC; Wed, 11 Apr 2018 15:23:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20065.outbound.protection.outlook.com [40.107.2.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4D6C36E65D for ; Wed, 11 Apr 2018 15:23:37 +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=f5ayd32g/VWlJlyrKRZrVFhBKN6yurhde1Is8bWSHnY=; b=mAvdZ8ZsrV7iCrXAAl2JY0/CHBqdcofLP5QPD9C2fOo77Z9J1nIl1ZxngXeSRP3Xgwj1THKK+ROAobBk7GtHFTjebYem8cRRF8zZObtAaaSuHgng5FUk4qWh1qeHZng0sseKkpPaIaXMaX1aiDNsfNlDdf6VMA5FfqrEO4JTd9M= 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 AM5PR0801MB1249.eurprd08.prod.outlook.com (2603:10a6:203:1e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.675.10; Wed, 11 Apr 2018 15:23:34 +0000 From: Alexandru Gheorghe To: dri-devel@lists.freedesktop.org, liviu.dudau@arm.com, brian.starkey@arm.com, ayan.halder@arm.com, seanpaul@chromium.org Subject: [PATCH hwc v2 14/18] drm_hwcomposer: Fix race in ApplyFrame Date: Wed, 11 Apr 2018 16:22:25 +0100 Message-Id: <1523460149-1740-15-git-send-email-alexandru-cosmin.gheorghe@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523460149-1740-1-git-send-email-alexandru-cosmin.gheorghe@arm.com> References: <1523460149-1740-1-git-send-email-alexandru-cosmin.gheorghe@arm.com> MIME-Version: 1.0 X-Originating-IP: [217.140.96.140] X-ClientProxiedBy: VI1PR0701CA0066.eurprd07.prod.outlook.com (2603:10a6:800:5f::28) To AM5PR0801MB1249.eurprd08.prod.outlook.com (2603:10a6:203:1e::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM5PR0801MB1249; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1249; 3:pt6VvQJrY8rFk8XzK5d8pRdAibiK7k3WuybLg/odbAJLnP9o8rdYS0Ul6iMZ9JJayH4KGjY/DbsBgo//o2rlsdGXCji1q/f7qkAUR18Bs9mBro4+RYLqjWjmTJhEiqY/YjgolIZGNUBU9DPP6ABWAMoiJGBwwcAKX8azCMc4ZsX0rkWRPvUm84aEZbtvaRKzXfjpuHUV6yyDhmsjyOGpE4T/64+xZMCzzBmFzmbRcgrkDyg/xDRL7bJSytjkgVKZ; 25:z7/sx6jhYCfRFEOl1siyQVi0oii/ZIEF2PqPrQLlqcmk9fJJRXRBzsV2Id40KHDRl4jzHv3o8W1t5y1uvG52jfYyWzxFkvAOCxoivQOCK1FRTqX88nM+9JTSwTqwW+vdvXATMz4gdvaRd9tghxbBz6BY96MPbTRq8GsYkYP2dBArXmkCWRqR5mYIpV4XUccIzbJCGDGYoR3wRZlmKZki7mu5jOHZ1zo/0fKQuU91XkkUNyO5UJJMm4WsDFYTQHt1tDhyQg9dwGTx3ypF7IcFjmkX8S36c27QaTmENt1oUuznDXilqDdK1LflCdYnSTfe3NCBeY+sBR66MzZTJaCVXA==; 31:N3eP4z2kAVZftiMadUZxRnz8/Gl/ZVkpSQZuJEN2s9bazc1o0hA+K5TtVqvddWooirQ76Dn5GLGwAeoOyl46ewxGxL/ZkmgwdusMpbJwrGAx8ynqo+JgP8ZhoBKbEIQeMLp/OFvIymskja3JDwdj7Chm1cL2ZJs1Tidc49HgjbIAqqTWF5z/ywd63KH5S0hbHvvgoDFSIBeQAxeoBD6VS5m12KAKrjZ31OpzYGJRpdU= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1249: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1249; 20:FjFpD+Z4ptq/9moOI8YzRM/Wno5J7cEjooX/IxNWBtjJ8b8Scs/PqB0OHjHuYgOsi85u+xboRW2fXfeanOX1ivwXVu9Qa1YCD7dTz+xljby20ytTvBrrBj4IR8vPvB0OOYIGJiFCvzZMhjt4oqEd0ErwpnyZHWzJHrRfGTCAd7g=; 4:7u2loVs3zJ3w8Eq4o7ig2USzzthOKUzT6Hk4drWSIYUdTXcHhtXoCmXmLjxgyzmN52ULbuQns5oZlyAsf6KICVJOJ5KNuu0rBuwngYs/WlusJxvpdRTtHDE7nAN/DCt3HniJpF7I7NCk/e6e3CCb/754E6gZuZpN0wPpyALwCCu4JgjEgp+bKpowRRR1h78y/Vi+NtVXXJCczQBAi3cnV6BaF9V3kyWB6DbbXusmS8lP9lm8bJzcjsjXYhIHixxr3dXASvXHPE0JZuyg7fXGI3YKgXEx6yYzhGD/ZfhvM36xPE491JcQbXxQVu5PKc7U X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231221)(944501327)(52105095)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:AM5PR0801MB1249; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1249; X-Forefront-PRVS: 0639027A9E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(396003)(376002)(366004)(39860400002)(189003)(199004)(16526019)(478600001)(305945005)(50226002)(16586007)(68736007)(7736002)(86362001)(81156014)(8676002)(316002)(81166006)(4326008)(25786009)(2906002)(50466002)(8936002)(6486002)(105586002)(48376002)(186003)(956004)(5660300001)(6666003)(72206003)(106356001)(476003)(53936002)(3846002)(76176011)(51416003)(52116002)(47776003)(7696005)(36756003)(66066001)(11346002)(446003)(386003)(97736004)(59450400001)(6116002)(2616005)(26005)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0801MB1249; H:e114479-lin.cambridge.arm.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1249; 23:zCe3FJDX4mVDPiGjrDwELtfWUfiEZxOeMc3bp7f?= =?us-ascii?Q?P5VXLm20JCk+vL3TUhkZgtGIoNVkXKoRZ822FFLGJQhmqite9Pn1Yr5+68ht?= =?us-ascii?Q?iXeRXoHjkBdfYPp+uM3RTnlR9iV1vBDhcF9EO6PoK3Vtxmv+rAu1w5vebF7O?= =?us-ascii?Q?PioSe6VKx2DeLAg8CNmaOs1dOICZFkMxJFJulLt9w/xjlMqyYBrPZ2vsuv1Y?= =?us-ascii?Q?MY8YM4XADkbfAajlPmZ3lFHXMauzTkIn07RDRZIMxOifbuYllnVfdgQbkjAf?= =?us-ascii?Q?tJwszMCYPadpcv+TZ5pfjdSAkgxP3tsZ9XoYb+9GR6gsNkorSCyq0JhQ6jSx?= =?us-ascii?Q?8RagHoqOZTsZiPSsYoQDEvzz7qe+3S8ZKuHzXUdL26m5m+rpjdINuof+HfFJ?= =?us-ascii?Q?L5eTPqwQPJe4PQxfDJ/au0SD+maya0aNMrRKM7qY14pxdS4sOHnX+Id6tpdY?= =?us-ascii?Q?tobjbT7q3Oe0PtlinnyWCkWK/t5tr0GBA+8lGWdURWPWOiwXbLKptwiPhWb5?= =?us-ascii?Q?GmT3uQ73rxTubcIUveymLke6Nt+qjWOoDnk1WpQmU0+4Unt9VmoC+Tfo7KJF?= =?us-ascii?Q?xfYnSt9otjh0WPYlmKgffsbogKeQthTh4dKOzqLDOdhfI/cj4g1rPPPnkZyj?= =?us-ascii?Q?BCFI5YrKCCoVyQ8au/9QGdb2gW4QPwJzN/Jk0xCIxhx6K6iKrszEf1UMQ5KT?= =?us-ascii?Q?+34pVXZaITr6rmUwZN75aLE+rDBPozhMSnWMdbEf+I3P3dJ+dPeB1WZfwM9T?= =?us-ascii?Q?GZNKmu4f25NQqJxXULf9tFUjlWbktPG1pIbj7BYEvQBQImHzcCNpeEJcm8fu?= =?us-ascii?Q?a0wydNUjIG3WNXLEYPr7SoQNE0IPOdXvUYloub/otwEtEkOTj0aTuB0iATew?= =?us-ascii?Q?JjYcqmI2X/fOVNMRI6v1mxJuGY7YLpoX9/79yktXLInyRdpTcylvo+EsDLWI?= =?us-ascii?Q?GStf6i8jpOqfmZgzrETDo4kNaymmkQhOKccEkCZ8xVXGef0vKh7NXWVmHysP?= =?us-ascii?Q?hMBqnyUoD3UX26fg1sQeRJP2ud+V+qNZQhH1IDVcf8kMQdKwIb6w9sODH6i4?= =?us-ascii?Q?sSKjv7PS3ARrujovGw2sKVznXzUvj/9LPq2ejI5+J94KNnTKrbzqyWnvCduw?= =?us-ascii?Q?G9JzghAOWxtsbBGyI/f7O5poky8EpY3E9I4Ot0DPt0GDdjr6NrBvT/UeVR8G?= =?us-ascii?Q?+1Qsg+5Wdz/isBHo=3D?= X-Microsoft-Antispam-Message-Info: N2voaWu5QvquJd9DdR7qsekxK2Wk57Us723wgTo2v0KyuQFsl9dPpeMmmVdxmTklvxp/aEbk8EiXlxYOc+NAY7djsQr8IdDq/EjVu9emH9gb71UGIxHAjKt+WJ/Uu49cpeYkSRfcxoU4rKGecu1J5VWKzPmpLgEOl9TRB1+IXYZY34+Av1ZgetWoT7pJRqIA X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1249; 6:ehQTHTG/hiCCH9cqXJ1TrbUByxhzpK4y8OqvtDyaoL58VsFthdfDt2/J86CEk/H17L1EImz0/8N+oX5ruGtS4RnRrvmSFJ2Jpn3PQrTOiqWxixQqNhHy9OqUFig0orWuMg4ZFjLsdEMOSU2p7hL88y1hREzWGwxsPMG4DqkPAzfE3B9Zz/u2Y8t2AjRJdww4OclvdomqOCegYz/xx0Mtv73yta3qTMCL3bptExy+SNf3zKXNnsQf0kcqO0yq6g3PFwEyIe9E1iwzMSLqxfhEkoDUD0dvIP9FJrR41k5JspJVq+fzxyrjpfeEaVbKxv6CCty1KtlaBAR7un1j5aqLRl1/+9IChBEAMs6xu+RLOIS907NUZodffMt+IRuIXbo20ZVupFVSwGegutwzF0xtbsGIcn3NBsvNUBghFsms04Cj2ukeHbsq4GGQpNhYIWLItbZJy9666lpJYHJ7im3NiA==; 5:aLw4QTrhuD3L3upSvq0jG8Nqk+QqgVOdo90M6WDcUoycT8EVT6xfWoc41CjsCqV7E+8UeHd+ggzXaxpsttKfirIl7i3GbXNc+n1LXj3U1SnloI7+G01RYCuDfyQmJZ/RR9yCOAU1zUcpvB1h4k+Geu3G9B2RZEXCmfNe4c9TqpU=; 24:NXcq7tp0BARnbXZ50xaEpGh2v/F4MfLgmqSlxV+vtFraJW7AufpTD/pvII7poWMMzZq1DyTeWnWjsowwU0ch0QxXWwdN+t4XfoI3evlLGf4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1249; 7:cq9JiSqwv3rV6THWW8DIQmoO0b4OHw4JV1dtU6zRVwVY8H1CG368AwWg6Bkz9VVDRUVbeowqJo+qXNm4vFHb/du6+CyjXxIWmLBsvOkcgqnqDqfNwxQd36nc2cjuawZrQFQjpUfFPQ+jlU1nrcCS1TATBftMLzDHbJfpGxviRrf7beocQqyQsjdVaBpE0Z63fogMIWJAcEdaaKfry9+QG5eJHDXDCTmejO0/JRKue6BcNx32l+MTk6miL7aAolZK X-MS-Office365-Filtering-Correlation-Id: 52050d4c-c6c4-4bee-a387-08d59fc03143 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2018 15:23:34.6862 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 52050d4c-c6c4-4bee-a387-08d59fc03143 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1249 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, Alexandru Gheorghe Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP ApplyFrame holds the lock just when it swaps the value of active_composition_, in a multithread context we could end up in a situation where something is shown on the screen, but something else is set in active_composition_. Fix it by holding the lock during CommitFrame. Signed-off-by: Alexandru Gheorghe --- drmdisplaycompositor.cpp | 40 +++++++++++++++++----------------------- drmdisplaycompositor.h | 2 +- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp index afd3b05..576539b 100644 --- a/drmdisplaycompositor.cpp +++ b/drmdisplaycompositor.cpp @@ -791,11 +791,6 @@ std::tuple DrmDisplayCompositor::CreateModeBlob( } void DrmDisplayCompositor::ClearDisplay() { - AutoLock lock(&lock_, "compositor"); - int ret = lock.Lock(); - if (ret) - return; - if (!active_composition_) return; @@ -808,11 +803,25 @@ void DrmDisplayCompositor::ClearDisplay() { } void DrmDisplayCompositor::ApplyFrame( - std::unique_ptr composition, int status) { + std::unique_ptr composition, int status, + bool writeback) { + AutoLock lock(&lock_, __FUNCTION__); + if (lock.Lock()) + return; int ret = status; - - if (!ret) + if (!ret) { + if (writeback && !CountdownExpired()) { + ALOGE("Abort playing back scene"); + return; + } ret = CommitFrame(composition.get(), false); + if (!ret) { + ++dump_frames_composited_; + if (active_composition_) + active_composition_->SignalCompositionDone(); + active_composition_.swap(composition); + } + } if (ret) { ALOGE("Composite failed for display %d", display_); @@ -821,21 +830,6 @@ void DrmDisplayCompositor::ApplyFrame( ClearDisplay(); return; } - ++dump_frames_composited_; - - if (active_composition_) - active_composition_->SignalCompositionDone(); - - ret = pthread_mutex_lock(&lock_); - if (ret) - ALOGE("Failed to acquire lock for active_composition swap"); - - active_composition_.swap(composition); - - if (!ret) - ret = pthread_mutex_unlock(&lock_); - if (ret) - ALOGE("Failed to release lock for active_composition swap"); } int DrmDisplayCompositor::ApplyComposition( diff --git a/drmdisplaycompositor.h b/drmdisplaycompositor.h index 0f8daad..b35ef70 100644 --- a/drmdisplaycompositor.h +++ b/drmdisplaycompositor.h @@ -127,7 +127,7 @@ class DrmDisplayCompositor { void ClearDisplay(); void ApplyFrame(std::unique_ptr composition, - int status); + int status, bool writeback = false); std::tuple CreateModeBlob(const DrmMode &mode);