From patchwork Tue Jan 16 13:34:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10166961 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 1CF59601E7 for ; Tue, 16 Jan 2018 13:35:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F443280B0 for ; Tue, 16 Jan 2018 13:35:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 040892834A; Tue, 16 Jan 2018 13:35:37 +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 00CBE280B0 for ; Tue, 16 Jan 2018 13:35:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB64589854; Tue, 16 Jan 2018 13:35:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0072.outbound.protection.outlook.com [104.47.40.72]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6EC6489815 for ; Tue, 16 Jan 2018 13:35:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=onevmw.onmicrosoft.com; s=selector1-vmware-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=iVIJFb9eloXMW/vm738wkoVJOwtump2w2bvAUby9gR0=; b=HSadwYXHKJCqhE8naJPvhcu1gdh8HAKYPSYg7mbhs++bHltFftHFIz/OvThS2mR4lQ/cbOvflKa+rG1hcBNXNMsEXFC3YdsXcs4tYvN33mevwlqX4NbvWKSC50EactdErIQs57Nn2EDvqH5qBspH20n052fziMLM+K2fNVhDRMI= Received: from ubuntu.localdomain (155.4.205.56) by BLUPR05MB755.namprd05.prod.outlook.com (10.141.208.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.9; Tue, 16 Jan 2018 13:35:27 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org Subject: [PATCH 6/7] drm/vmwgfx: Send the correct nonblock option for atomic_commit Date: Tue, 16 Jan 2018 14:34:33 +0100 Message-Id: <1516109674-10087-7-git-send-email-thellstrom@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516109674-10087-1-git-send-email-thellstrom@vmware.com> References: <1516109674-10087-1-git-send-email-thellstrom@vmware.com> MIME-Version: 1.0 X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: DB6PR07CA0086.eurprd07.prod.outlook.com (10.175.238.24) To BLUPR05MB755.namprd05.prod.outlook.com (10.141.208.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0962d0cd-c30f-41da-5ed8-08d55ce6014c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:BLUPR05MB755; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB755; 3:wtmXei7WxHXHW7No7MNgBp6pvvPAd6mM2xAwqLCXfM4KzYSAZJ/k2poEBy3PMNg8Nxx0hv0eHQWIEWtHZVmBrwaUIa5+bEvq8pLsi/TSpKxHR8Mwp/8BvUWNzrbLXdYGeBZs152PjzJW98eK4PtWqIqFbF08Yw3lYWGTxxWMK87YCF3eXV8NIEzZXJRddtptOZbSelNNBUx575hSlfxd9sChXKFAcekFJm1WjpvgdNgEfSjh8+FCx9LelZA3CysR; 25:DOOw/bbErNXC7+XJ8teB/A7yipv5HjYD3maLEVimM5NLjUY2gE2SK55Jml4YObRVn45rtWnwVBNEbysJXRwcNHtb2Vr6BwIrXHhuV5MRKLepPTHCQ27RvojiIVNyHWhXJVulY6UXdZlaeUZxECDxN7TCPizLbMlg2oIydPQI5hLdHR4a8/06kkpSwqbNZK9QQEhygQr4YPc7A7CsRHm4nz1zXjBsi9sVUwKcvvPMyD9f86oIv0RjR7LA6esAfiTyzPec/CI2ePi1jlGKap6f0o9su+b8P6YhJ/eKITDj8jtu3JO3DcbkafDE8A4dUYfm2GnwfB10B6DS6OJuLYPyPQ==; 31:X6LmQvJiPzDI3/5C9w0MQoU16QDTo5+d628L2yu802Nv+3CVMuUie6GI65quT0mLYDPGLMamQkNFmJs9z0aiEFgVie8E+035aRHqy2JIZ39JKjkRqGdzbUY07I/DdkX0b3TuD+zQJa55+agck18WIdCHyfhwovLXuDgHwPzwd+Zq13RYPyidyNIQqXBGKUu5t/7ejaM+5s6fwLN7xn3gfu3aXqMJe23YcfFIuJ1IXc8= X-MS-TrafficTypeDiagnostic: BLUPR05MB755: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=thellstrom@vmware.com; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB755; 20:bD6xMydRLyg6uE7Dl/fuyTSHgIQvC/+QVBmhWml+LXf5XRl70IEzMKwnaY+AieZJn1CqkMJ0LLiLdumiTeB8H/1nCJKfzSZVjTFOxz8ZKeVaWaAigEQgvv/xwXgnWapepUM8i88De5cyVr+mYnVxX9MwHjMyTo6crwhuzDm6l/h1UWJCg5+v/QSd41YlDcBaAblci4ekddajJ0U8gMxhgZ6IA/M1+U6++l5Se767VbkMSHYSNOjV0qzQWxTSJMkGdbBrZU20rkMOa3clJiEFH44VRzHq+2DtHO/rBXtkX9wLJ43O+mcXrtrlUapvx3u9r9z4Ir8gg1soujt7P06ONEQXFUYl/fQp2Tb0NC/ppLlQWQadah4KltGYzGub+jpE6FG6WwDC0V/vDnybbv146qBouVddmuZ7xThSiqKhe2XouCquTWNP/abAB0CHnJQ/kuJBQnLAoYV4Cjx2IZilCOBOzKa6rcwzsJ7Gm8iPYHAjN9LMJqivzI2mm+EfeLb7; 4:5q/gHym9iZy6Z4T+EkDyKX2vSI7SfQknIWihujIMK+4yKtTsvhq7v110qTvmlPIk76yYJ1Xeswz5HuwWFpH8GB7sAUhjDgpmX5xjQzvveKkqO+rcr2ZDwyUgfMMFJS296PMdq9TA1DJSMl6R8GV420bZm1HYXtTVLMNHNiVH+oIwr6bUVO2wr9nsoL2mZ3t3qbIByPDZdJUX8nASp3M1gBKxfC2TA62hxsR0supq8YSNwN5bUa7DF9ZRGYekp9acmkM3HclAz21fv4YN6PcM9s3FEw/K+8SioSM5/q7F+1eBrXFYP4xNLCG1gvg+lGfr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(3231023)(2400035)(944501161)(10201501046)(93006095)(93001095)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:BLUPR05MB755; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BLUPR05MB755; X-Forefront-PRVS: 0554B1F54F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(396003)(39380400002)(376002)(39860400002)(189003)(199004)(50466002)(7736002)(6666003)(6916009)(97736004)(106356001)(305945005)(6486002)(2950100002)(107886003)(478600001)(105586002)(2361001)(2351001)(5660300001)(3846002)(86362001)(6512007)(59450400001)(26005)(386003)(6116002)(76176011)(52116002)(6506007)(53936002)(51416003)(2906002)(68736007)(8936002)(316002)(16526018)(54906003)(16586007)(8676002)(81166006)(81156014)(36756003)(25786009)(47776003)(4326008)(66066001)(48376002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR05MB755; H:ubuntu.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR05MB755; 23:l4045KsOQRTxrb8wZza8eSYc+7LBclZw4X5Z9+Xv3h?= =?us-ascii?Q?Rxg/paxCMRz7zOjtBOI2fkcqCiBPV5bz+RJUQrzBthbZvM5Xd30GXPGmqTHU?= =?us-ascii?Q?whrTBf//4EVFzniMLb2D7d+tOOFclFKgrIDzu6N3/FFZSwSwldj9xp0eWAcD?= =?us-ascii?Q?TYEpRJK06rHS7hEM7LOfRPKOOktxR89cixiTfckDQbHB9kVgQIUppJkkd93M?= =?us-ascii?Q?TnMHAi9P4RaIzSAiDJeUIb2iVDM50q4yGoVopwI12E0LiCX2zJoNpG5fgw2N?= =?us-ascii?Q?GnqE6VhR2J0t5JARuxO1aTgmCCH8WjftMvGalUPeXwV1+TyjFjBoE/uRBFS8?= =?us-ascii?Q?2iW35vSajeJUj7E4jVBo4UB8/xaDs9nA8aRP0MkXqvgiz6OiuMNoP5EThL8M?= =?us-ascii?Q?P9i2Avxzb0zlW6y0MxjRocz9mQk06kdeHzXiU2e7VprTOxI6jdioj/Epc77v?= =?us-ascii?Q?JDM9RJpFpcjOucgOs/GRJBxQqPc5F2w8gk5/Q6egsKrv4i0zHq/eQWzW58XE?= =?us-ascii?Q?8afu+QXN57REt1c1GmEiB7u6+k4czfbKiypxWML7dalWWU7oIKonDh3mt+qp?= =?us-ascii?Q?YWGEcIQ2aBbaiqjccNNoID6eD28LbtMrF7+NsGirn9lZE2avI/kbbEFZfcJG?= =?us-ascii?Q?qaZ1PIbF1H2d2YXgJKmWeIDTJ3qU7Nz41j6YI13nZsIRBzc0V86iPFXiH6Zy?= =?us-ascii?Q?BNOwSh2FeLTpXNII0RhjoZq7FZIVjL3UKrUF3M9gGvFQoeUG77HG5867iSDA?= =?us-ascii?Q?Yc5UZ2xqXzdJ+mUwdLhJ+CQsX+tB9Wk+IBkdfnnxWxV0ba6LPE76YRoPdFwm?= =?us-ascii?Q?KPKgtgZOkTbV3BE+Bx8hB9TClux7UzYUIehbydtEzDKNkOevRcXxjov7QiKj?= =?us-ascii?Q?Nbf5KRDdvHUFIG8PlAssloOgO0c5Cv4ucQvbnGpuje6YAZyLsQB91njCscvS?= =?us-ascii?Q?5ggE2gpClFfLeI/RqyR/d0D52rlk7A56v7NrCJj8vi0ZF3QWPO4IhB2i5JcF?= =?us-ascii?Q?MbIiGUgS+X4crg964fdl7aD78UBl7I3a97yg5gcOZvIn44e9ovAQKkfcAKBg?= =?us-ascii?Q?wdWm+1McvIYVAM78OrT3wTtYthWwrFOSCuznF58+ofKJsifW8RBHvNQc5PjH?= =?us-ascii?Q?u2nbM0hMLVphj+eUrNs9iaX9JhsCG8sodLArjD3jt+fZVly3TKFLFT/s9Oo0?= =?us-ascii?Q?I5i+cSfy/klRQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB755; 6:Pmg7qDZf+jmR7O3rHmNcFolgWZ0HrVOmcEO9l33EkNMRE+/noIqeUj0QluV0kG3+DQ+TNMhaE9Aa/4/D7ommzQab8NV9roX2zf0cECNgayuhtbGSAeYMuZMhiDV6r3kcZ4Y4K8cSD3W2YymhIKYFeTn9cKhjjnZz6V73HtCKbVDJWYhOcCSSTjg+RG9p01J4OCdn2RrtPyH+XMwIX5gjpfgzdNDJnX1T6RKFwJLxvstdcvAtMH8+aNxylcNLWWA5bTzZif/DsqWK4+R4MQBXBwU9aeQpu8W58EnYc8xonjMyInlQ8x1aZ+jXpJf1UmPi+plA/W+d7mGqEM/QwdcN4kJkYls0Hi+0HeZDB+K/Xes=; 5:RLmmr6yhSpYGPiViqMASmb9cuxrHQiDrg95s3GEXaE4kP0M9KAV6IdFzQAzgsKdZj81qgkF/Osm40EsqbIJXgFtHZnfuo40Se2bMglD2N/MiNP/2lbf3+sFLmio8BRcXv8N1e6jolKPNiMN5GGz8oKYhId50WgC5sRzpwyk86cE=; 24:ZyNusANTUPyhLvfxh05vMUkgczrLcUICa+rQKjPjIbQr8RmDGOhki+gSRRELBYLH/P5ovnZ6EcyNfX9LhqvTy98Ipicw2k9RIm/I2Iojmho=; 7:FvBaSo9vVUw/9OcKvyUiRzmULGwbRvTGoliwtJicy2zrzLSoNmFggRPPPsvS46mxAaFehi0G/t1BmRntM9Bgct0junPlQW8BTyT033uHuHLG6vz8vrVWJwUrF2sBCM7ovXiXJH8sDIEB4LX7rAJHzhJPEWcYhLC/jrFPXzVvUk15YLJFVan+Ci5FqthBB//sjePDQveh5WDDWaMik47H/9YPozdWZqMa5/vIj8xvfknidrMxhkZKOWWouL8aa3iL SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB755; 20:oOzUGd6HhpKsnU9H7eNsP+G0r+gDXUx2s4InHFX/UwbUPpYziS9BuGzGbhX93P2PwJ9fo3mlDnW6XZz2BqEnGhgWE0Yb1aqgu0xXWGdrghxoGjCNbZ3IB29u1V4L89dExIEoK1mWZGIuXUmevfKhqR1R3fkPqE/RrA3njL6vq1o= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 13:35:27.0402 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0962d0cd-c30f-41da-5ed8-08d55ce6014c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR05MB755 Cc: Thomas Hellstrom , Deepak Rawat X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Deepak Rawat Page flip can be slow for vmwgfx in some cases, like need to do surface copy to different surface or waiting for IN_FENCE_FD. Enabling nonblocking commits for vmwgfx in case userspace request it. Signed-off-by: Deepak Rawat Reviewed-by: Sinclair Yeh Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index a7e7863..3f1ed51 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1548,35 +1548,10 @@ vmw_kms_atomic_check_modeset(struct drm_device *dev, return drm_atomic_helper_check(dev, state); } - -/** - * vmw_kms_atomic_commit - Perform an atomic state commit - * - * @dev: DRM device - * @state: the driver state object - * @nonblock: Whether nonblocking behaviour is requested - * - * This is a simple wrapper around drm_atomic_helper_commit() for - * us to clear the nonblocking value. - * - * Nonblocking commits currently cause synchronization issues - * for vmwgfx. - * - * RETURNS - * Zero for success or negative error code on failure. - */ -int vmw_kms_atomic_commit(struct drm_device *dev, - struct drm_atomic_state *state, - bool nonblock) -{ - return drm_atomic_helper_commit(dev, state, false); -} - - static const struct drm_mode_config_funcs vmw_kms_funcs = { .fb_create = vmw_kms_fb_create, .atomic_check = vmw_kms_atomic_check_modeset, - .atomic_commit = vmw_kms_atomic_commit, + .atomic_commit = drm_atomic_helper_commit, }; static int vmw_kms_generic_present(struct vmw_private *dev_priv,