From patchwork Tue Jan 16 13:34:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10166955 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 6F38D601E7 for ; Tue, 16 Jan 2018 13:35:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 608B228565 for ; Tue, 16 Jan 2018 13:35:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54BC72856B; Tue, 16 Jan 2018 13:35:29 +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 D821728565 for ; Tue, 16 Jan 2018 13:35:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 089B1897F9; Tue, 16 Jan 2018 13:35:27 +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-co1nam03on0088.outbound.protection.outlook.com [104.47.40.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D79D897E0 for ; Tue, 16 Jan 2018 13:35:25 +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=Gx906RQgR+9O+TxBhNmDcGpFDMZhRBSx61rgq5zHugQ=; b=G+RR3LbmoTje2nfSC2haqAMPIT/iS6HVZWAA45I5YivbAmA9gguTsUMdEaPKpz53Tf0kqAAdaZouzE2Ig1ti9fjMTvAWTnMRQVS9SSJKQbDFDk7B+JxGhlC5j5pG5LdvSPsRlGPTw5KtmXoH4hhwqquLjowLpjjARS8sJsRaMGU= 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:23 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/7] drm/vmwgfx: Remove drm_crtc_arm_vblank_event from atomic flush Date: Tue, 16 Jan 2018 14:34:30 +0100 Message-Id: <1516109674-10087-4-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: 579f915d-374f-4c24-7983-08d55ce5ff1e 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:fiN9PwTuDWccDpdZ5inYaZGogbZuv6Z40tXt3AcZelJfI6pRose7037vO/UrgfNkSeBGfapX/SYVh/bvsxYjVGP64nSjKWfxHl7d2GWCC8/77Ek5tyY8P71WR4aXsxc9qZkeukq2IHxIYH30S7LCYT7x0/TZASCecr8dNKMr6SX5fq0cYLhjPMmDx3mTWqCIiyugxXMYTPDe6/Ra+dK0qar0Yv3cbbepf1+Mk1UvuowATTUZDdXxn0c0J8dgYn2p; 25:UxLrve2qyHD0zpgkHJb4O18Qah+rXOG6GD25oJ5SXnV9h3+wryNSyl5wBLbncteyhBGFroag6h+erCWLz33qtXgJ8B4OwA95k3UgUWOqQPL5e3TiQfeCx9Vi8QgggHTDu1Zb65dxeml58csgfQphK7NqhoAVr/Ql//ZM8DFc2lYPkoulAzmn8ldkXDX870F/TgcqxfEgykXhQhGFfZLR7gvHqrX3D2EbGO49t5wigoDCAef1bfvMVJkn3wzx8Aiq7g6o0kGJnPyrPR8gvkf0uzAnxJmDt5Pz3oELY4EXamm2xp6oE3wvo0HWdI56ENufKl31WeoWWJvOEG1KtU+sBg==; 31:Vwhaaq2PEGTTRORdUP3GVJzhZLWuKuJ2tlr8G8o2+HBIGB62wUtwY2i/4RzpNKOWjbsHxlWcBIquixvXU7cHP9gz7NMbQHmYuxZwK9gE3ESeLrV+moyXYSOjhYJ8GMK5A2ZzIgccIxWrUfti/ehF8fnYwNwu0sv1oj1nfU4bW9TXC1yDV5K82kXu9qUT+DRWfq65p/P5KWdudZYR7eK9FsJ6r0PLxC8c9+ImnnApjbo= X-MS-TrafficTypeDiagnostic: BLUPR05MB755: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=thellstrom@vmware.com; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB755; 20:8BCFFN2PkDgmfDN1dxKLF+bJH0d+HvrB4b0gNZTbmkUbi2JolkXEC3WtD97YZnu653xKr5d3EMLDtPItkX0xQcA4NFCxjCiM93W09e7b4g8BbchmmU+sBQDlFbdWIK7ZQeXQ5aQGEHzEGR52XfIgFZv6I1eHyf0mZ7/rfKjzcnewChedcOZzFjNEtkUe/4rVYOuVS2HbpmA7VpS24dRy0+8mVB7HvP9moaIv596/ESHqP/BNrFfjNkpMOoyaTWgkc4EyhRc6Yk9P5QL7BfUADKD6PxVtGHo34N/jgT9ZHdmLAfRVSqQioN7E7EGOShHgXoSPczZamFgihkMGGluVI6D2gWysggvjIyWFCmZqHdNEIxGomSS7Hr0kFpzWQkegWKh4HwIzDZjy24PVljexU0b0h8fbm29EMcFYSTNFFh1CXkkOwEfv84ZOmbLwOdSu0aKKaxqSqQjX5EVwolcE8V4EmygsCqTx1DeZ1s87vGlC58jTG+mgEQg/VolRjB6x; 4:LZeRVQh76rjqx2V00exrSUgoNTtMEamBzgNiL1OEXjbQ8GhgAOBzNwbzSFTyY3vEhX9wSIBffgQsapcch38vFX6HPQ4eR5ufe8xCMm81pta9T2qr1cESHlWkmlXQ+aDlW+oOgNvhcnf7L4pJKtq98+Uvqz2maM1O5htRviqNggGtuDdxoGWyWPp7qFFi0rEdS2C0/acHY0malXTnBpD/BNucCwcpY6gZBoYrKhCyKbDksa9IV/XbTfygptx73SMIB+HKIGrueCSZUqeUbDXy0QrvrAcj1D/VpU0R6l1ZOYPdg6uEdSxGzp3/u7c4RATJ 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)(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:ZCTN2oL9opgPGHRpV2U9D3e8kD2fHsV4SwGNtjE9a0?= =?us-ascii?Q?zVucZg5oGlMqUT6yIAcXz07V6q2rtcRiBx4V8/ViHRU4DIKhq83btWREHup3?= =?us-ascii?Q?1MmkoGxOkP+7X+uQfgCO/pEBvu8UscmHvvSCouvGUbgXS6bevyBlyyD+jzJS?= =?us-ascii?Q?1k9m7O75CIeReN40Ij7MYleDIpczymavI4PBdOtDLF53pt4RfSvSCm+C/iX3?= =?us-ascii?Q?Uk69D5sRQ4mb90KIDdSD7jCHP21mN5PnyNDPS5C2LMo5ibdmWrq2iaWHepQ9?= =?us-ascii?Q?tV7esjxxUhNeOaCwHy/HpiADO2qCy7TWnr5K8dsn99EvrjWNFJk7two2ymK5?= =?us-ascii?Q?kpfsdW0af4WcFqK1441yQyJrQ3c1CVzdWPixXXxLy018Bq6mrcQrrQq7pDev?= =?us-ascii?Q?VYoD70bEKAPENrVDUgQ46bY9XDKbQxxfiz3pgzD8haQK5qNr7HCLaMEdI+X7?= =?us-ascii?Q?W8AzfX9tidO/J6mr5xKlRnDZJxM/mmmLev+Bxa8mDfw5cs2AmYlh66FKI+By?= =?us-ascii?Q?yRe7HJeg4UPB+ZSjIToGbBUyBFqsvYIF9s057SH71iXNgGWBVs8rHBLMBLiJ?= =?us-ascii?Q?NQaDL0i4qrJDlVYCjCrUdez3IbpXMpqwvwq6QOm/BL9VPBTHz0TU7kEExGQY?= =?us-ascii?Q?lVNG7jebI8dNvRrdQl9vsJi1DEcxty9/Xsred+jW+Bcw9R6Oq3a/xNs5rkjP?= =?us-ascii?Q?PXR8tvv8A2ovUbKRKgipAu4UvXHFiKTaaLND8gLiNIT92KLbjjkNbsyDDlLc?= =?us-ascii?Q?TKsmrG/KI8m2Y1g6llj3f4fZchquM88B5Gy+oOoWD8M9eICMqEc4SYH6/agd?= =?us-ascii?Q?cHMnCsuFzwUm0dz4wXRT7WDWfvHBd/z+WfM4NMUhd9Muk/wv+Yz6CH53qrqG?= =?us-ascii?Q?d7WOGr4ev+GwPWI1dP1vRQL/chbni8YoOFqHen8DQDt4mVhNcBDF9GdccV5J?= =?us-ascii?Q?fyscOP7wrdmIh/jP//iDG5mYvn/yjkUmzCwb1b0hBJsWYZ4zdUezJ7mQq7CG?= =?us-ascii?Q?jEGqKTuUpEezI1wb1nxHGy6QRrV8w4PUta9HXGppNnfNTE65vpm9qS/DKPSQ?= =?us-ascii?Q?X6sUpve+RlJmyDT7/RuhEHUwHi5VqcZGHo8tMhwigABSH1Us+0lXcsM6eWcQ?= =?us-ascii?Q?A+bx22QMObB9Vaz2eRNoiF7r9772ov7MaUchvZVY4+bR4BiGsOxQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB755; 6:BmDIpD+cE0ijvdn0WW0RPBMainHspib8PQFKgtAebzvb7n8c9GLmICgtoAJCcuPrGSzeSjX7E44jd46UNVbFfYCm6CH6BR7EiyQ6s1AmVVALDvTUl+GvL2zX9uxulma/JIgPy3/Oh8vZYZBAaXeTz5P9jdOWeod0syUepOhMTdUzHWxjyqkPtkZm08Fi0L4YDY7VbP9iotzoeIc2nJ0YG6Zi9C8ulzCCTVdj2JJF1xLwH+DIVk9XfubWQYiwxL2dErPFRsrFN2vZoHhw6bNnGwNYQBv+c1reZYXEGuVfamqzTsyvHL8rh8U1wKAx4myUDA3TdTRQbyeKM9XGN99cDdiz/fnKrDQHw3cKQExLWEs=; 5:zTn9FL5Kq1MpemOByghPrV/FS10KwMwBud9JGlTl6EcPNTfZY/UiWbGYve6wOMj5HwcFd9KB3z7M/Ea6DvMVElZ8KU705ET5JABB6iQnoBJdOB6RzkbrRbpputCUrQvws9o62hDI8AhMwtOCvg9+OMbTA/dOKUigw4/hAE5tq0c=; 24:puJ9ngAVhC+T8dE6HLzm8E6jNSDB4jEC8he7aQ5nnUT8fFo/V9B80aqLddE2Q+7Ezs/x20PLiHmzyFM4KTc/zTrZ+Gu2It7u7qQevtoBtZ4=; 7:duSiYWNSvMRl6PUb5NFWHTlv6z9F+avjsSNJ725ErE0aMupiVB82pQxpHm3K84lt1lgjewzWFEXD1nCh1a8L2RKEq4JyGea5JZxcGvhrvivxS3wOgr6iDIkEIxmL/Ivr6OhJRZGcVGcal9tUGTiyNPsLi2jus1BAKa5/avNwiZn3KaoEt6UVzNfVf/+avRaoqhRqeygYeX8WyOlTyA99+mE5lBfZpHR7eVHZNjOmTyc1/ZzNvolEc/8ZiVDAcWnv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB755; 20:tV0K8dLj2gpCTCSh62p81rV7wyDBufwMwiElgptMt1JiUXG0k2hu2SWjcJyhOy86s0yWvhZwFa7kr95ARnNcDTrm0deFa1AOZiDPALFo7q/E3MMiUs9DCPyzj1Ku/MiNDMNdpAinxtZbuue19YvdwopswdEQwgs7ajzHHydTZqs= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 13:35:23.5090 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 579f915d-374f-4c24-7983-08d55ce5ff1e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR05MB755 Cc: 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 The function drm_crtc_arm_vblank_event should be used for the driver which have vblank interrupt support. In case of vmwgfx we do not have vblank interrupt. Signed-off-by: Deepak Rawat Reviewed-by: Thomas Hellstrom Reviewed-by: Sinclair Yeh --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index cc98e01..a7e7863 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -572,13 +572,9 @@ void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc, crtc->state->event = NULL; spin_lock_irq(&crtc->dev->event_lock); - if (drm_crtc_vblank_get(crtc) == 0) - drm_crtc_arm_vblank_event(crtc, event); - else - drm_crtc_send_vblank_event(crtc, event); + drm_crtc_send_vblank_event(crtc, event); spin_unlock_irq(&crtc->dev->event_lock); } - }