From patchwork Tue Jul 3 19:14:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10505019 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 2559660225 for ; Tue, 3 Jul 2018 19:17:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 153CF28C60 for ; Tue, 3 Jul 2018 19:17:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09BB128C7F; Tue, 3 Jul 2018 19:17:45 +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.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 946C428C60 for ; Tue, 3 Jul 2018 19:17:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2BFE16E8F3; Tue, 3 Jul 2018 19:16:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-BY2-obe.outbound.protection.outlook.com (mail-eopbgr710060.outbound.protection.outlook.com [40.107.71.60]) by gabe.freedesktop.org (Postfix) with ESMTPS id CAA046E8EC for ; Tue, 3 Jul 2018 19:16:54 +0000 (UTC) Received: from fedoratest.localdomain (155.4.205.56) by DM6PR05MB4587.namprd05.prod.outlook.com (2603:10b6:5:9f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.11; Tue, 3 Jul 2018 19:16:52 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org Subject: [PATCH -next 14/15] drm/vmwgfx: Fix host message module function declarations Date: Tue, 3 Jul 2018 21:14:59 +0200 Message-Id: <20180703191500.2374-15-thellstrom@vmware.com> X-Mailer: git-send-email 2.18.0.rc1 In-Reply-To: <20180703191500.2374-1-thellstrom@vmware.com> References: <20180703191500.2374-1-thellstrom@vmware.com> MIME-Version: 1.0 X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: DM5PR21CA0042.namprd21.prod.outlook.com (2603:10b6:3:ed::28) To DM6PR05MB4587.namprd05.prod.outlook.com (2603:10b6:5:9f::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03304fc7-6b9f-4319-bee2-08d5e11988d7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DM6PR05MB4587; X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4587; 3:WFSdb43Olh95+lkc81yZVDaNzOGjF7mUCUDS1o8VkVINsO0s0o3cF6sHerxN+6syc4HZsUdNCdY5s5Znx5w9a55TtOO6QsmoK23WGvMRWw681VSlsngIUGup/lX7evXoC96E1mhMe44wWGfJyz9m21gMDqZdF1vGJ5ispEnXMPMVDRq8WOJZD7ffYD5lWaw2q9iMh/uYzxI8MyQTM17l/+udz76fagh2ooqK7FURe4Ca2RICdCeQjnUv2yEeClMI; 25:EfS+uY25d7sKtdGVyA8n8ofEymBkvdqKjsCCZjI+w7wzQm9Ge3+MwN9TT6fNdXaNE1WgeuQAVOkVhhCcdlCROdY54fPyu0LBAd0JAdu2qSM0b1SMOxppOeOD+IgZlELJ8WIxAYB3+8drOMI2oJvwInRoWPLdMx0DEYroUMJeGgdMPTYM5hRn3Syp5IwD3l7xAT6XF+zw5du0mQ74QIGiUe1gm/0itfqriGO6KR3wTQCjBFq3oJqjaTAUk6OQ17WsR4uOWtG10yWu4cobnW4EprEyir3iDeNoxRCKNab/rK4RWa9V0AAn/9rIPP4Z6KXnWh1xb0osCeo38DV5C4+KTA==; 31:2OnBh5BfS67XUgvGb2w48NADu6hSLrf3kO9SwHrsDTkPMpv0yi60EwNJqhGerPYWQWelzABAYgMSdopm2O/xb/fPEPNOFTZiZh4PRwgQu2oUl6iUXt6RZRA26+8dzUfNZc4gu1QH/ggJa6CKgCq6iIKsDciXs+n/THPqtKxJ1zSv/OVjN83ZPxzcn2P6D1mmynA5iZR9Ii+AsVNoQzDAHaeLkkkgPJn4gORir8qqkn4= X-MS-TrafficTypeDiagnostic: DM6PR05MB4587: X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4587; 20:u7zs7QsH7e7WYW4I87cNzQWRscNfdUkNvJ6Z0gnzvJnuMhPZxgYjnb6caALbbYGipZC/gQKS46etPi4gEcENy/LG92BTMCgegRC6ZllXGSG1xilXwjfGt4vnMI3e+nP29f0lsKOwML2YMY33LNn+3uF1l70FyeWZrsNPipZh5EmV3N06tq+Es+2grN6+7ZIl1eAAtbTOQqniUOihowoPKs150W2MUx/lQwQg+bjnF1bjBI7/euOSSPyoEIrRJXIQjrWCAfmaRPTfSNBZcnJHG6j2wt0S+gRCLfHaBUxsFrp81ReSO/bmgz4qlEbCwJQ75bJrRBc+qOlympxAS5Fgr17gxV7KCHQTPxiPVCM2EDy4B79GsF2bznRduY8Kn3q+g7sFXBNHX+DL2DqnZw2mW3/1hgCgOjK1+z1A6M7RPo1eEbHhd67ak3r835/xzjt7sd6mQudyiEpCQyunjB+/bQS8qm4JSOvBE6iNxJNe/Li3jGRL+shSX9u0wb838AK5; 4:T9qrdixJRHv9s7wjgQvhobAo52y/kUYOMcQJjPjJzdVPnKSnMx2jVYgBlTXFoU48A5jAhLDOq7UvBwMVdpI708zkWSIg7Hxgv+F5sjt5eewFAOG1kKf+TIZFE0hwlaZVUSpoNJz0Ebj7ZrtSD2JvrAtMXUyseuVU9Mk9cSfEEPD2svN1fIjgFWBF8My2Rki8/V6+6fRZUVGTuXVEjJmDKaYtu/rL8q/urQqBVFdNS300p/AZWjOpet9K/TolRNPAMKQveb0fGRLHS1RY0Jc6tgnlHRdsGtuF4PKz6AumPn4ZkFz7cqV5b2MDGFgKJh+g X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM6PR05MB4587; BCL:0; PCL:0; RULEID:; SRVR:DM6PR05MB4587; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(366004)(39860400002)(396003)(376002)(346002)(199004)(189003)(2361001)(53936002)(76176011)(68736007)(52116002)(51416003)(15650500001)(47776003)(26005)(2351001)(50226002)(16526019)(97736004)(86362001)(386003)(2906002)(6506007)(66066001)(186003)(316002)(16586007)(48376002)(446003)(6486002)(50466002)(11346002)(2616005)(1076002)(956004)(6116002)(6512007)(476003)(81166006)(8676002)(81156014)(36756003)(3846002)(5660300001)(486006)(107886003)(106356001)(305945005)(25786009)(7736002)(4326008)(478600001)(6916009)(105586002)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR05MB4587; H:fedoratest.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM6PR05MB4587; 23:8aIxMW5ZyxHzDf/YArbRTwgpWgBN1FJCVA5FOpU9t?= =?us-ascii?Q?rJ5ZFpMWTgA0DWkyJKf8U+miZ8mzszMYvVhi10ubePZe2+vne59XXVJJo7Ah?= =?us-ascii?Q?jmO8L4Q8UV5LcmZjqkzOYjmFhHJd087XDKPLcjqN07+OFNQcu243F1anFYHm?= =?us-ascii?Q?NQr2A3DHvJoVC/YjXWt/Y4mCQFZf/nV/FL7s9JfCkLATKuBbSN92uSjU5bdZ?= =?us-ascii?Q?kSaHze4gZr57/a6CbdiSpusYswFuMfEfC/rxi9F3EMmTmF9P9qbVjAYEQzF1?= =?us-ascii?Q?boFQFIsrUF2cpkBSyxa9iWKRXAEE6mdsQUZf7Xp8S9c7uNG2Q/sjh8ys6j5N?= =?us-ascii?Q?3Lv3wnYxeoBuj8wjKgwBUDNSPk4PZDe6a5WBizLIp45FNx25W4qWLzzMISta?= =?us-ascii?Q?LYkcNoS9jWEP8D6PqKrQtyqIWKT3rsE8Wj4JQwqLU5RCzrKB7gssjQTC9b4v?= =?us-ascii?Q?/5iKYg2JqyeARdS6Rel1uOOjlCUJVWpbPXh5lmfgbQL5izn0VkLJRunTRoOS?= =?us-ascii?Q?PhzS3XyOe39lLqEO3o39bAWzyahHWRNhXAorxUxROex1dSyOWWtDXs4pA9va?= =?us-ascii?Q?q/K210UL7DsJqJ1bG6tDff3ojIOoLsJN8Jdn3FdPUr32h/HyURMKBpPQcyqX?= =?us-ascii?Q?4E4Fym76+wl4N2mYRc83S/TBLkbZIXSq0B/Xp0Dqv87S0YrZhLgo+d/m1rKI?= =?us-ascii?Q?pSr8l0ZEuQMwVcqz+gSHftWrkck7u2Y6H3/D8zGeO7nmJs5/S9JoUSXF9cnA?= =?us-ascii?Q?MrhnYWInzq0sowyg6OZVidJF4YQ+JrGTv2SvxJsoEO9xk3ne88lqCooxuTeN?= =?us-ascii?Q?RKp0U9RJ+Hvxqzj7h90OyF1J5xMwXEe73vL1BukMffD0u8v+QzERbDvE5Cwm?= =?us-ascii?Q?mkr5Q3iQsN/2zU/hgSqkE6YAbm2CwZsuLTqgu9JfhDHoefVXkqdyJonoTsVC?= =?us-ascii?Q?TUBQouC553Vu1vOxgo7MNsuSsxsl37hj/eb8xq3FNnDECaL8Pi5I0a1zC59u?= =?us-ascii?Q?98UsOUEVs9Pzvi5/JQeI+Y/AUxIs+EpZAkOINIJRUT7kaC+rJVFHtVM4EJqa?= =?us-ascii?Q?uHE5pWNanI+d+rMyx0HV01V4tQA8t6qWB9q79LAOvuEDG0onvk4syDMS5O5y?= =?us-ascii?Q?BITJ454SEeZy9m1DGAtpCWOaun+kJ7eAK5DguD7TlKG3Gsx5OfM/9kwq6a8D?= =?us-ascii?Q?6t4c4SGcyTL0C5KcswkxAvkgf5G4nihUf1hKAmBGO7tU8Kg0r7QvqohVwYXX?= =?us-ascii?Q?x2uXAy1L3LvMyPTNgY=3D?= X-Microsoft-Antispam-Message-Info: ron+npy01w34mZcI8nnQnI1E1O7SPXjltQsTa0+MgqJz2W4gT+anBBnd1RhNcWvROY/xr/5k++FUZ+mIQNXCwOxCwmiuttZsDnxLbmZkHo5VfdBhgeU/4kULbYMhifre6P6ob/H06EQMX0D4b4VN6Ym1z8GZ0HhHDh5l/TA2B34hnXGMdG03I0TJwh26b5Z9XBkmfPLx2inCMJ6pfEiuBmQeQuTlw1HNp+9KRrOpjkVK8oZukwYZsCmqIsk8WLZO0kqA5dfXqwpkTvvqm2pzV7V1ZpmSbpaI5AcWPba+Dnk94qJh9VhDgOpp5mnM/sX+BZJRJaZjS6SXUtFAaObkeS65RqMw1QvCHIzw9VRF28s= X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4587; 6:VxAg9s3+8HoZMAhTrBgb8jFHGE2Z2mnZmeHeiYjABtmiMZ/5D/gAS0FUXUF4KcplnqqnBUL72G7lx27ObpWzyx++1UkbNovqXY0kMo/dMZAxd4EegmX+FL3DTYGi19lLDtCXex89OuhjfhBiCFXN+4GWgwUsZmhm9oHrfTCKd06ERrP7pJTfmyG1giyKCSFSQgu0HXx7OOUWP1eGgx+/OoRBylnd2VtkEE6kecKomGIE2+sBUCp2Z7moQWZh31iR8ElbTcwwnPGGEbSbSmfX+eNBoa7O7HPofISmLOI4K5U3CwCAV3YS2eIcEo+P3EHbEvS92zRl9UG9rYbt5NxZHG2A0VP0+5Y7EWWWMi7Iisx5NeX6jq2Fyj9IG8vVKmd7JTG7hzXLVe3E9DeNU6TDO2QBb6jg84CfMvcCal6eyy+GOs4c1533Whs0ENT3vG+Ft1faiG7Yu3WWMIg4ZUr2Cg==; 5:5Ee2QUGw8EXLOh3+aMjt53kUEP8Y8mRGOmWFiQuLgfwnU+bvgM8tZdrx6bO2KwPzaFoAEPTf2kz1x3XKH1QY9VRatl2FmSQsh2s5rM7lfiN+keVX4MD4iKnwLFM5i2wtWzNNw7MbKipc6Stayhh+8aAFNNmCs7pgWo6TxPxTjhE=; 24:kflAVZ+TjOljy5FNwqVDDiaKPpdRM3FzDKyG8Mek0IQnHnUm/yuGv2qhDWsCRpFti+MM9Ul1b2WZrHTzhvJinCL8JRHPhLjYGzfb1RBqN/4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4587; 7:bHU44NBKmF+DlG+hKg1knB4+bJtQXXiR5/wEROn1jsA5cQg+e60bXu5BrnT3o3BUdlEIx8hH8K47ynLEWrCL7AIis25WgHvLGw5JPCewSoOK2cKAHZABB+wEudGhRu152y4pdhcJn8WZqbXOEs91dq1T6yaMbJVSRfv7J7/oHfiLGr0WHzp0Jc2ecM7orrXY5qKLUCzXel07ZEpjS64aYzUePrpyoLvHm1NArGtXz/pioBNYsecnva1XMdHAdZRt; 20:KGQL28MdGomG84FewzDI/2TY2ipEsi7XCT7Bj9E/ONrLyLPOGR5VNQxhwsp8KL2BKAeTUjy83I/H/NOzjZ12TJXetTiI1XUa59A3WJTJqToE9JrLF1m3SGD8tjJxzew6ue3caog7tVszcXNKsShQR5wea8S7NKTI+h8nsQDpRQ0= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 19:16:52.2130 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03304fc7-6b9f-4319-bee2-08d5e11988d7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR05MB4587 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: Thomas Hellstrom , linux-graphics-maintainer@vmware.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make the host message module function declarations similar to the other declarations in vmwgfx_drv.h and include the header in vmwgfx_msg.c Signed-off-by: Thomas Hellstrom Reviewed-by: Deepak Rawat --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 11 +++++------ drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index a38318c3efe4..a3a0826958a1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -1230,6 +1230,11 @@ int vmw_bo_cpu_blit(struct ttm_buffer_object *dst, u32 w, u32 h, struct vmw_diff_cpy *diff); +/* Host messaging -vmwgfx_msg.c: */ +int vmw_host_get_guestinfo(const char *guest_info_param, + char *buffer, size_t *length); +int vmw_host_log(const char *log); + /** * Inline helper functions */ @@ -1309,10 +1314,4 @@ static inline void vmw_mmio_write(u32 value, u32 *addr) { WRITE_ONCE(*addr, value); } - -/** - * Add vmw_msg module function - */ -extern int vmw_host_log(const char *log); - #endif diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c index a72268e97042..3549e6bd4178 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -31,6 +31,7 @@ #include #include #include +#include "vmwgfx_drv.h" #include "vmwgfx_msg.h"