From patchwork Wed Jun 7 13:24:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 9771533 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 2420860350 for ; Wed, 7 Jun 2017 13:40:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 157AB283BE for ; Wed, 7 Jun 2017 13:40:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A365284A6; Wed, 7 Jun 2017 13:40:52 +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 78DE6283BE for ; Wed, 7 Jun 2017 13:40:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83AE46E246; Wed, 7 Jun 2017 13:40:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0042.outbound.protection.outlook.com [104.47.34.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 752916E248 for ; Wed, 7 Jun 2017 13:40:49 +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=UzwUKMJTuKiv9XymaKN2Lg4+tFBhF8uCQypLsT1PFXI=; b=C5xzoKGRTAgGsEjxeLnpoOYUvYkI7Vnnqx/p6pxqjJR2S0JPHQx9JMBSKbEX2etJBC+EkXAOno+aFhAVlpVsNGBkcnNcWs7zPFZZU1L6ufh8stQv+s9iueN92gNVIsmatZ/FVy9ixs2ijQHHB8CfzUZJqLVJO6K08utNBbXL5RE= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=vmware.com; Received: from ubuntu.localdomain (155.4.205.56) by BLUPR05MB753.namprd05.prod.outlook.com (10.141.208.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1157.3; Wed, 7 Jun 2017 13:25:03 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org Subject: [PATCH -fixes 8/9] drm/vmwgfx: Remove unused legacy cursor functions Date: Wed, 7 Jun 2017 15:24:24 +0200 Message-Id: <1496841865-2349-8-git-send-email-thellstrom@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496841865-2349-1-git-send-email-thellstrom@vmware.com> References: <1496841865-2349-1-git-send-email-thellstrom@vmware.com> MIME-Version: 1.0 X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: BN6PR16CA0019.namprd16.prod.outlook.com (10.172.212.157) To BLUPR05MB753.namprd05.prod.outlook.com (10.141.208.140) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLUPR05MB753: X-MS-Office365-Filtering-Correlation-Id: 247e437e-5397-4ea6-d478-08d4ada89b42 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:BLUPR05MB753; X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB753; 3:fdiOA8HDdPiDPObzvTKhGWb+qPpdc4iSi9xKIBnNZDnJ0xXMZ3lbLsvFwKq7BPbbT/0VYkG3/TxzFxBkdbpPMU+PfbpPeZ0xKl24A0Mht3lovIebYfOKgHuQBoz2jDd7J3bAq2X0O4q6SWL/3a1uN+22jEYQl3+A02blWlDXal8d6fRyg2UCijKsHJ0CxwpQAXn/fLE1quOGM/gIE/aYAaGRB3vPl1kmnchdjG7JzdwhoveictJPWLNVBbuMn35yBY0+Bt8E4TpcnEMTS0waJZMK23pHMinPdiSkslZuvWTYicvj1JTSNfF02Xv/zG6S8PvZKrYlfiW241a6O1+TSg==; 25:QzdiSy1fBihIbRvG5y8E0hXayWZ0cVAu8R7gEZsEk9OWIUiC2l0jKhct6Sb4makochkwQz5Gheggi9tLEWl/QhYHRKft7Ij9dAadjqZfBMyADo9dU2B+nbJQTm/sgthWxPKISKtYhH7Mcs6hjzXfGiYk4RLt4M7SSCpLQSckqNoV2JTLVT6K/ZmYvoHmtzjBmZ/tRaBuRZXXg4GrFqSRZFap19/SYAHga1pJ9HQAPPlTSJv+ghwpUnNTe9PzOMN1kaYlTOUByUrX+lW7vOniP3eau3vGQwGrbxwsXATaoymxrovO3pMURMeq2jBZcNQ2RJ9CGdEVODsvzOVrtsLqnR/WKVkmWSjaHWUAXcEj8cOBtLaeLkPgkSaM/VfE/jPuEERpqFXJltxBJlkbBaz6zcgYVTgdVd7dPFPJ3rfi0/GpmdiTZaZouk4myj1FIlpbIZG5BzW7MPPBXO+xx+/oAXvweAc58gZXQ4rsE/QTiLY= X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB753; 31:W05MW27x7L3Wxsf5bId7R/s8WZ/cFgjMFE3GG4mozDKjqWiff996N/FxruIY3/Z1bhY1F0ZTcpZ5AybROP19mr7B00FJnsNsCN7Xuf/uGPFaW+y6jj+umONQnNcXY02kvY5+wWA8FoYiT2oQldSWaaGevftlLK/3ucfXDspZVi/3QCr0ea7WqoX7VIJhFSG7V1AsqZpJ/KKeUF4iouhOEteqMSxRb4b5M/n4bbmEu8s=; 20:LNpYj2FeDZ8iTZIv/p9ZK4f9PT/C9TLUyGUCYOB/J20dTXDwiEUrTJdiwMpC0bG9uZH+xg6wrUUz1scqe0GO7SUJh2yxWUCwTa4vmIegvFC+QQpyLQKmipgu8SJSXZ+humeIeeTEWdQ7Vk0LW3NzGt+ZoLqOUtZml3XtIkA9Ag/jqWq69lzxKsAnxEXvBfVpJeCj0eROKh9KYPndbe7R2uhbw5MD8zY0CKbTsYbi0sXD79bToO63Iiu9+0r9qdH5vzpUAvZDov2uGWTG1AHIL38gvl3TQkejnvCV3nZXlTfg50AMFRRhtnu2bhvRV66mTyE/NDfNDPGbU3lpHorch1Cqrr9ddbm6UmEEpc0fQNNwnIcH78VtzRfSp77iqWmb6zP/gmPVNs/uXPD6eQTwB2nBjACM7V0muinKYUon7Qqvf/aF5BcJMO4pgkP7JHORhZIc3nrv24LB40rudYeXsSQ6SAvXpDP+Hqd1wlsytks0AHLjEvz7NHTo9Opdhmy0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(6041248)(20161123558100)(20161123562025)(20161123564025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR05MB753; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR05MB753; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR05MB753; 4:JInoBPN0Q+7uSaeQFHVWuAfbjT7Xkvu4hdrzEr6wD2R?= =?us-ascii?Q?GopDfo0sONr7HSMfIxbsvRcqAY687SGY2umVoSuxRt/zDifw0H8xDDQkTqFg?= =?us-ascii?Q?lLE5o/t9jFEhdd+r/94Zf0c/344nZiCinOCQ6Qh1lwVdrM/Zjk1D5Vf0LflD?= =?us-ascii?Q?EqOtBYopcIIxq/VHNKOmIZkYyeiFBg8QusRFZpIw8xnuwfKKB5xP2WCIiCgh?= =?us-ascii?Q?Teb8jtTfdmS9XK/6qNKJjNNHFwCU6cfadat8Xfc1KpEPA8tqlpQBDc6A8aj7?= =?us-ascii?Q?9ihBnZndJj2nKihNPyM1MlNQgYOyf9CyYpf7hzOdkTyR0zotac5B4IoJ2oQT?= =?us-ascii?Q?RD1X2/rUYTgOO+MLXcF6tcedD7g0LZ+90BjopxqdZrD4eZzsHsKSFaa2w9ZU?= =?us-ascii?Q?pMKDY9g9KYgLwFuX5Vn7D71PpxZ4NpS2/hYZNeFx/D0HmmcZS28KEbbHuSbW?= =?us-ascii?Q?Ioruj1AOwwdNgc4vYPEnVyR5cNE++DueOdBkMpgoWVQYmjzufhP71eHW5D3u?= =?us-ascii?Q?er1ECiGuRIVWF0k+5gKII91fWlpCRzTI325wXAGetvBQG9Kk7tMsG7m29Phm?= =?us-ascii?Q?U0Yisu8RSVfKajQmHy0VFhw748GYXDevg53W5GOePW2wYpOjvjTMIE+h23Bw?= =?us-ascii?Q?vJ92ezwcLbnNtztDnjXE9xTwWmOBrCmMpWG8Gv3H80D9YSzyylZeG+sRIZIA?= =?us-ascii?Q?+isLnojdKy5rMUOcrLJ/SoGNqZTrGWWVa8h12OXNiHQgKsBqff3DI6h3WJ16?= =?us-ascii?Q?xdY1UOdkcZ3U3WCLVy2zqV93msYmz3HR03XViPQs90lpDVSm9ZYTFhlbPw+p?= =?us-ascii?Q?ml/YDgceOfeh9IJyrer6Fzi5mbJibQv4WmumLV1C6oT7YZqKn0zcbjZsIvt+?= =?us-ascii?Q?mii3atV3+jq2C5xqTUCPJG9JPvycI5JFtmTbLI2D1NN2oLWlGjuGR0i0dlIN?= =?us-ascii?Q?6M3VNfQEKdzhXFFj8ydt+cf3GSfFt+/hTkKKI6nVzRHawUi909Y9p+PCJkh7?= =?us-ascii?Q?omdbniJZb1pQrifQFiudN07+YKA6qz3aBzMjI/cpflWaHnjns9md5t+Yzzb/?= =?us-ascii?Q?eGWpx3eIoEwBppOQghDTJlpHTvWPaJMP4gvGJhceRmF++pJ8QAIoxeZ2NLGv?= =?us-ascii?Q?KhQz5QNbJTENQFoS0A9dBAdsX1sdFks5L++S3YgjwSNkrSgABX7mzcLSzJmJ?= =?us-ascii?Q?wCpW2gkU1VcY=3D?= X-Forefront-PRVS: 03319F6FEF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39410400002)(39400400002)(39450400003)(39850400002)(76176999)(38730400002)(107886003)(110136004)(2906002)(305945005)(47776003)(86362001)(66066001)(5660300001)(3846002)(6666003)(50986999)(5003940100001)(81166006)(6916009)(6116002)(478600001)(7736002)(2950100002)(50226002)(6506006)(2361001)(33646002)(6486002)(6512007)(25786009)(42186005)(189998001)(2351001)(4326008)(50466002)(48376002)(53936002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR05MB753; H:ubuntu.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR05MB753; 23:R4nHFuXmgJaEFBW8PU45SVLnTrXAw8bspIa1Tt2pD5?= =?us-ascii?Q?+7LgS0W73zaZO1nLBuwDnaEsSUgtOmDPnbx7j1/QhUhALwTzUaBIeIR2KXOX?= =?us-ascii?Q?xgeLKBlKEL9hoxaLsJG96EQ4scKIwTZAszr3FL8c9+SvPbmFJQf61gJmaFqr?= =?us-ascii?Q?FY+ZAf4wT5mJQTxZwJd+jkOrsqsw0EZksmSSWNNEQ8mT2YYMTpQgpfSwsnSP?= =?us-ascii?Q?W7joDDFO9Gs46zhln0yetA9yR1n3eClqpFPT5zB11qdOXBHujtLVkT8zk13E?= =?us-ascii?Q?GTXq9duplhAy4tjzSt3dZExDDkjPpxbKNYokGLoBkEwH0n6Id2fEgC5PGteo?= =?us-ascii?Q?FpZU9WleCsI8VHNLcei+I7Do82IPV4KZ1ZChQqZaOQUfdOV2LaUzHlc6rogp?= =?us-ascii?Q?HA9zGBJMSoHYMZMtVtz0OfB8eGrN44tl8swdi0ivt0/zhoXYuHShTy3SGZQI?= =?us-ascii?Q?F/SayFfHn514ucRwQfwcpF0o7mr5NWNhFiDGAEcuQegiVYP+pSzh746Z7bfy?= =?us-ascii?Q?9kKxBuv7NqhI3oClZZ/wx+3v+1Hql2tmvQRcR+Wexg3371IbPbq1WEcaK4Zp?= =?us-ascii?Q?DTpgfQ0abn2zdzZzdqsIcdt0vUOhT6J7yvyHgvQjTRtNal5ESkKVQqDWs3yg?= =?us-ascii?Q?yLFHSvGVJC6NYgNiWHv+Be7Wa0fwtVI2vYMhKZvXxEPdPRQibkOUd2aM1pOv?= =?us-ascii?Q?C5hUrijWtOAs5wMTY7HHonfTUyRWtkKtUdYJFFlTorDhLoAG2Pvxl6iYhGWA?= =?us-ascii?Q?XZCGJZieMQEPcN4JLYkENcl5B+8MM0D0B4cCMWGltft/eCKu8zEILbaO8Kcj?= =?us-ascii?Q?ikOJZVzm9RqSc6I/YCd5aMMUqDvysibN1NUCxjAQeWHqnxgJLlPllJm2DEqd?= =?us-ascii?Q?F61HLOTToZhEUc+zMtFnRi1iRnOds5aeyhOpWUQayFVBClsIWU0nH9G6QD2u?= =?us-ascii?Q?JDuCeS5A1pR4KJuOQMzZJIMJ3hOttcKFoppt9fePAJwxpDcMpOM1nD3NvmkD?= =?us-ascii?Q?c7elVotfkoXWL9LBXVLhSlXmwRrhsCeoA95eZzHizlKw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB753; 6:GmB8+VRKmVezbG/lUIPSMgJIFTjWbz50/RLllCeKWwVmIShqjTnSykoXYkwGBGsBm0Sbu2I6GUZ2tCLmeayQefqahzy/JXSgw9aHaEqwuBoBpIFMa5A1c9pXGZPUBaY+qFRu6+UzNhIzCVoGs70beXgQI06CMFXSLgnucj/6ORCXJUkXmBHYEGRE6WYDJ397JqQKxh4++2RM4/CuYaWRmDVYinVKrtpd8a6C39xzARONxyjBxX2kTzRXVGjUgrRiySjZTT2EUnZ5xMQNAiMNjuSbtxKbXY7CVcGabMTbWsOsQzH8GcofDANF7qg+mWq9yyAMDcbkQRMb1uOMo7yhTSwnArFDkynOzWW+B+1Fn4f4Q1pRHQPaBJ6ae2D//WZRUIwda3c7/pIeQOQFAYDyN5u0sZFnggiLdBJy9DvYDiM7653gDFeADztDdhdmJG/QKMLtgI4jhmESENYd8QLti4smMW4jBRHzvg4kRV/G9zZIvr77y1KDcQV3ukfrEd2IcekxKC0O/hYtw3Y4DOXcMQ== X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB753; 5:Xy+VCbkesrDTeZ8iLbrqGZim7G+LDiePwEvxs1VL3/Z9SM/vunYXbxOKz/BMWDON9W5fnESpZxx+TjIdnmxEqMXXHFdhW/MedGFlDK6IGGZn42lcVhQst0D/ikGcvucA6BVn6OXgR/BspKv9yCVdZ37aBXUy32qDu748GYjKAGggMYqyP0fmY39HMAbw3laNbnp0LggyTUDn8kWlHsZEFPsBpnm92tPmueckdRvoPSu6mNaAzrM1w3mA3+RtyIBBMjVLxlGrlCbodA/5DKa/77xf9Hg0+DOWegmvkOep3rHF9BZVSavsQSITxJC51nftEtIIHKMOL/8/36dhm2USlwgtBjuI70R7HYhd549Qdds93bNMHiFlpJwPl7oOTgoE3E7hoYfeYsPaWwzHAx3T6ZWZ9++J86fmsYKQOu3be+0NZ2UmH/tQ4hyplWjE/krefi9rETvJFSmZYq9kI5dNuIJV+F+t56QAcn3X5fixRCe7ulwwVJQywsJQQeD8QnXk; 24:r9guW/2WKTlj260RSkQdy5yhnIQE0pXtZBEUSZ1yIXBbx7nMnq5NO7EqZc4NkcpZDvD/v37SKExa+pOZhoWzxBRWYCsWPcCk55k4615CyEM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR05MB753; 7:MqZhp7KA65wxSn/lJcBLkrcVb/ZW5ICjyETiQ8uwq2eyoNhoFjxPP9znjGwgDVLYS9DPSMJU5DeMzj0iBmRahD3IsjzDk3pFX+JdkD837pKQZaxrj+dciiyJbCvNMrWQETs/zblNV577FQlkfY1ZjK4mHygbhLbrOswaXlXMjsEOSyeQWPHA6S7J9cIOaVptqEGVQyFwjDZK0gA/CfLXr04rcFMUn07tpIvXEAsD7DZ0z9WXlGllbU3jEU/Gz57IQJTAGw+0ebDbFgW3cit4ziukRimlNmpjxIk5R21Lbe+Bn4xuPqorV+TclQcRRi8v5lFozhrSqRDQ2VaLh5wNTQ==; 20:wEBHQwJum6G7P/L6UYPlgGlDCSe9R4tEJy6E6CvG/RGn/r2GVOTFai6v8dmQQ26DerZRa0AW4v8A/eDWkqs/fEvraivPgkjXEkoXRVcNRzZ3XLEkY5R6UkVHdCB7TZfcjdXb8DsrHUcvVUvliCwhCj0G0lRvOAELaMghCI27OYw= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2017 13:25:03.2041 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR05MB753 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: Sinclair Yeh These function implementations and/or declarations are no longer used now that atomic is enabled. Signed-off-by: Sinclair Yeh Reported-by: Daniel Vetter Reviewed-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 114 ------------------------------------ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 15 ----- 2 files changed, 129 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index bcb6ddb..1d2db5d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -274,108 +274,6 @@ void vmw_kms_cursor_post_execbuf(struct vmw_private *dev_priv) } - -/** - * vmw_du_cursor_plane_update() - Update cursor image and location - * - * @plane: plane object to update - * @crtc: owning CRTC of @plane - * @fb: framebuffer to flip onto plane - * @crtc_x: x offset of plane on crtc - * @crtc_y: y offset of plane on crtc - * @crtc_w: width of plane rectangle on crtc - * @crtc_h: height of plane rectangle on crtc - * @src_x: Not used - * @src_y: Not used - * @src_w: Not used - * @src_h: Not used - * - * - * RETURNS: - * Zero on success, error code on failure - */ -int vmw_du_cursor_plane_update(struct drm_plane *plane, - struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int crtc_x, int crtc_y, - unsigned int crtc_w, - unsigned int crtc_h, - uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h) -{ - struct vmw_private *dev_priv = vmw_priv(crtc->dev); - struct vmw_display_unit *du = vmw_crtc_to_du(crtc); - struct vmw_surface *surface = NULL; - struct vmw_dma_buffer *dmabuf = NULL; - s32 hotspot_x, hotspot_y; - int ret; - - hotspot_x = du->hotspot_x + fb->hot_x; - hotspot_y = du->hotspot_y + fb->hot_y; - - /* A lot of the code assumes this */ - if (crtc_w != 64 || crtc_h != 64) { - ret = -EINVAL; - goto out; - } - - if (vmw_framebuffer_to_vfb(fb)->dmabuf) - dmabuf = vmw_framebuffer_to_vfbd(fb)->buffer; - else - surface = vmw_framebuffer_to_vfbs(fb)->surface; - - if (surface && !surface->snooper.image) { - DRM_ERROR("surface not suitable for cursor\n"); - ret = -EINVAL; - goto out; - } - - /* setup new image */ - ret = 0; - if (surface) { - /* vmw_user_surface_lookup takes one reference */ - du->cursor_surface = surface; - - du->cursor_age = du->cursor_surface->snooper.age; - - ret = vmw_cursor_update_image(dev_priv, surface->snooper.image, - 64, 64, hotspot_x, hotspot_y); - } else if (dmabuf) { - /* vmw_user_surface_lookup takes one reference */ - du->cursor_dmabuf = dmabuf; - - ret = vmw_cursor_update_dmabuf(dev_priv, dmabuf, crtc_w, crtc_h, - hotspot_x, hotspot_y); - } else { - vmw_cursor_update_position(dev_priv, false, 0, 0); - goto out; - } - - if (!ret) { - du->cursor_x = crtc_x + du->set_gui_x; - du->cursor_y = crtc_y + du->set_gui_y; - - vmw_cursor_update_position(dev_priv, true, - du->cursor_x + hotspot_x, - du->cursor_y + hotspot_y); - } - -out: - return ret; -} - - -int vmw_du_cursor_plane_disable(struct drm_plane *plane) -{ - if (plane->fb) { - drm_framebuffer_unreference(plane->fb); - plane->fb = NULL; - } - - return -EINVAL; -} - - void vmw_du_cursor_plane_destroy(struct drm_plane *plane) { vmw_cursor_update_position(plane->dev->dev_private, false, 0, 0); @@ -473,18 +371,6 @@ vmw_du_cursor_plane_prepare_fb(struct drm_plane *plane, void -vmw_du_cursor_plane_atomic_disable(struct drm_plane *plane, - struct drm_plane_state *old_state) -{ - struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc; - struct vmw_private *dev_priv = vmw_priv(crtc->dev); - - drm_atomic_set_fb_for_plane(plane->state, NULL); - vmw_cursor_update_position(dev_priv, false, 0, 0); -} - - -void vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, struct drm_plane_state *old_state) { diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h index 13f2f1d2..5f8d678 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h @@ -256,10 +256,6 @@ int vmw_du_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t size, struct drm_modeset_acquire_ctx *ctx); -int vmw_du_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv, - uint32_t handle, uint32_t width, uint32_t height, - int32_t hot_x, int32_t hot_y); -int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y); int vmw_du_connector_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t val); @@ -339,15 +335,6 @@ void vmw_kms_create_implicit_placement_property(struct vmw_private *dev_priv, /* Universal Plane Helpers */ void vmw_du_primary_plane_destroy(struct drm_plane *plane); void vmw_du_cursor_plane_destroy(struct drm_plane *plane); -int vmw_du_cursor_plane_disable(struct drm_plane *plane); -int vmw_du_cursor_plane_update(struct drm_plane *plane, - struct drm_crtc *crtc, - struct drm_framebuffer *fb, - int crtc_x, int crtc_y, - unsigned int crtc_w, - unsigned int crtc_h, - uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h); /* Atomic Helpers */ int vmw_du_primary_plane_atomic_check(struct drm_plane *plane, @@ -356,8 +343,6 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane, struct drm_plane_state *state); void vmw_du_cursor_plane_atomic_update(struct drm_plane *plane, struct drm_plane_state *old_state); -void vmw_du_cursor_plane_atomic_disable(struct drm_plane *plane, - struct drm_plane_state *old_state); int vmw_du_cursor_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state); void vmw_du_plane_cleanup_fb(struct drm_plane *plane,