From patchwork Wed Jul 4 15:57:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10507301 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 7BDDC601D7 for ; Wed, 4 Jul 2018 15:59:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67C6628BAE for ; Wed, 4 Jul 2018 15:59:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C39328BD5; Wed, 4 Jul 2018 15:59:02 +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 084F428BAE for ; Wed, 4 Jul 2018 15:59:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E79E16EC2C; Wed, 4 Jul 2018 15:58:48 +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-by2nam01on0078.outbound.protection.outlook.com [104.47.34.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91B396EC2B for ; Wed, 4 Jul 2018 15:58:47 +0000 (UTC) Received: from fedoratest.localdomain (155.4.205.56) by DM6PR05MB4586.namprd05.prod.outlook.com (2603:10b6:5:9f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.13; Wed, 4 Jul 2018 15:58:44 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org Subject: [PATCH -next 9/9] drm/vmwgfx: Expose SM4_1 param to user space Date: Wed, 4 Jul 2018 17:57:50 +0200 Message-Id: <20180704155750.2749-10-thellstrom@vmware.com> X-Mailer: git-send-email 2.18.0.rc1 In-Reply-To: <20180704155750.2749-1-thellstrom@vmware.com> References: <20180704155750.2749-1-thellstrom@vmware.com> MIME-Version: 1.0 X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: PR2P264CA0007.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::19) To DM6PR05MB4586.namprd05.prod.outlook.com (2603:10b6:5:9f::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86ecdec2-8db8-4a7e-ecab-08d5e1c705e7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DM6PR05MB4586; X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4586; 3:paUTqF0L/nxEGxMvXdM/6YGGbvCw0hPFAEv9Sc6Hwp1F5CViX33PUaGB+eM6Rbf9GJ9mS6zUjJ+InD+DnlwAA2xkHUC9orEuADoXaW1vpiHRFp6q/01B3JuofmD2SVRwzrcHWm9M2QVSlBQatlpECHVQAapkm9EZ/XRPm33yQtXK3iZKojN/Uo/HS/+IrsI/ddsYLq+CqRdEGw5o2tXyU4CVk5v0522wIp27eLy/3tfhpdE3H7jvz2G3x7MkHgLY; 25:LTaUoGf8iZFoCAXDatRdYWsvcmrexS2aPKbz4EmTPDjp4qW1sBWnEUYtHFa6zPAkjVLtRCQS/10G9AqD6CuyWfiW9YDo/bB0lXqjEnBN5bbi3imaULp77RiRcnokSdE4khT3c3XeAtQOfueyzUZrxHh3XhzkGCMibevkSSEHmnXUFzelQWo7LBEXqI0s6xFsXbXCieH3Nj1kyyjOFGDt2tJGwGf+Dw1h4Z4QHHxXqRofQHUp8AjAx7CCZn6Ep/gXk8Z5Jd4KP9rttlNF5oL7VKgwaQu238cUPkKILLOs6YvapocYENi1Hf3sbpv6i9kY1/SxVm17SZTFHPEtMZogVw==; 31:rvCWNl7xYh6uZ/BvNK81H4kOW5ZEQuTN9vkOuV746vUo60YlVXh70qOm8wkewR4/TmzPoqd3hlcUgWccsscaW37T0tQNUeT8b2vErpnPMVoDb/xb9Y0QnMVn/Fx4DIJ4S+H7fAfMe8eAknUUj2bD+1cBF/gvLo73x5BL9s4FepwQE/QU2qKAG2BigSGwzmFk/brkqJrh6nE3r0u5YCnzt1wrv10r56eVFNJq+lP/H0o= X-MS-TrafficTypeDiagnostic: DM6PR05MB4586: X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4586; 20:vUO8Qs8zCVRDWTHQLHG4VRqKH/TtiLFcgbI7IvxjHmPlxdY6DQ6uqdhY2KaCnShPQrIHHXRGd72cL9CgayCdyn6/od1T7UvAgsMhO08EAClIxyYPLc915DB8z0xNiuT4mANcqSZK1GmmjrSoobsobgkxW6rur2b08IuOiHANDNn86XVf9A5K9+KggZ/3eNKDed9G77GpfhGIP0xrBF8M3/lX5CJZQnRds3bzPTANsIybL48Wiu6U+rH5jPjz2kyPZ/E/5GWq7//+YXLehZNOlXtYTc0ILp1dA9QJ0vRVTADzor9I5nDtMPnO2ihoGOYwjKUF8vF0YztVn7eIb1S+fErgo3sH6Diq5Jm4PxvijWMnU/yMIu/4gnRMHzW49qb23+4OGJ1cYjzggxFEHweS5G35jMAPPyHbmQhH9SpZVKrCdIjwbC538U8uTx0GQk6Qe/54YgA11Mcw3Bs0VFN3UU+3ELfTyySNe7Xf9FcS3HyuPIgUPNgHcjHPAp2N3tKH; 4:bPUr9pW1MgBoGDehbFdPmwVrIZtlq5ekkpW9ptmVtuYb2LJl0tO/84rn97O41esPS6v535pN7UKJjnQhUdcsw4Gkwgtx1gVQSq9m+3Ewoj7K3iowVQ85nwK8KMyRrzHSzCC382PaoD9LvlhaEj4P0+m/6S08U5ZdXxRF4aif0ESaCN6/FmaNd9Uxm9rQnTyewrUyOfc5KgCH3hVdSE2efBzleJ01+Z7Ab82DgrvvFyYPx5rV475CXupJun5Jch4A4w40AQhRnqu9ZXJWM/8ZmxD8KfDUiUrs/HdXBFdR0EJ6y46QzJeI0MVn9Su2kmPa 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)(3231254)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:DM6PR05MB4586; BCL:0; PCL:0; RULEID:; SRVR:DM6PR05MB4586; X-Forefront-PRVS: 0723A02764 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(136003)(346002)(366004)(376002)(396003)(199004)(189003)(1076002)(48376002)(8676002)(478600001)(16586007)(2906002)(446003)(486006)(11346002)(81156014)(476003)(956004)(316002)(6486002)(2616005)(305945005)(81166006)(51416003)(7736002)(86362001)(575784001)(6512007)(52116002)(68736007)(107886003)(53936002)(76176011)(2351001)(97736004)(6506007)(2361001)(105586002)(4326008)(25786009)(66066001)(47776003)(36756003)(186003)(50466002)(6916009)(26005)(6666003)(106356001)(8936002)(386003)(50226002)(16526019)(5660300001)(54906003)(3846002)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR05MB4586; 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; DM6PR05MB4586; 23:klx40O2LrYS8miSgqlTzs8dKXotXg/LmjECiP3ckT?= =?us-ascii?Q?UeCHhtGTelCDjsSvELy5sIrJKV5yd5fcG4MNz6MUcQTxRKMTMQ0J7mAALaK5?= =?us-ascii?Q?Kk+NvYaocQMXgV231L2GV4Yy6O8LiReYLo2be26dzz/0ojyLUQIsTFrXCWVV?= =?us-ascii?Q?SQAo7d+UPsnsgBtg3vbmsVG27ICbiLySydUPCU+fLmT0b+26pLGHqRcSZ5xg?= =?us-ascii?Q?bTHJKwjUnxxKlVRMUvVFcGRh1XpwwLz4rtheX87NwzpeAiWlAPb7+Hlz30Ll?= =?us-ascii?Q?aCnIOELAdGMAxFzJ2YRe2ha7LfKJRcXwxZuIL8v2AFxo63+MGnXahdQqf9PB?= =?us-ascii?Q?xgAy9yy13DbkGSb6GGZgRFwPz/ZNT0rLh7zDb4S66ZGIqgLvAkQT7hm3v/Ry?= =?us-ascii?Q?gEvHgV8UpfUuBftbOZF/0ZmmlqZlPb5EPf/OjCFcDITFqrQo1UFRIOUhqbDv?= =?us-ascii?Q?frkkYciV8ZGY4oOaWkg3nfZ7lkN0OPf282GfEgyMEwlkDFFzlrjByzRvIvuR?= =?us-ascii?Q?2uQA0IC83Ddu8/boNQMTk8jx3xFqlpkAcPX4PfetNa8JC1b2/6yFAhjnGxV6?= =?us-ascii?Q?1zqyCzXVBoH5mS0+gxiXrnAKVYYFm0C7J54gUGf7nmbgbplILrNnlCLeEXuR?= =?us-ascii?Q?l1szzNhSbc5+yO+3M80TYpXcd6mCt5alNouDHuOKhav4A+aheEX1Lgjyt4bi?= =?us-ascii?Q?ZZ/uSKo2wZDOeUyHigBgAIaUZlE51ZwgNoAQKUrHIyI9xwIXgQHxr1ATE/EP?= =?us-ascii?Q?+VMwaTGXNBFtk5YvLVvYpI1hCtUv6aR9e7EkP1aNCAYVzuda5gOc1jvAgGuB?= =?us-ascii?Q?hbOQcPJt8QZ+CUyeY8LcJuwLdoN1nHqKI0VxociGePCgbv3xktEKmURbi5yo?= =?us-ascii?Q?QZt/URPAEGMXqtbbhXxETW3Zr3KofIh1UpiH6a3nTnhNUkxQPrHpd9NBNsNg?= =?us-ascii?Q?HLPNSsZEs/+rWtEdYBeDnk0cd+Q7J4WWqsfrTXSdK2oImmRiymeylKx3+m3N?= =?us-ascii?Q?7Bo/XE7knTfGxUp/gF8W3aTRqKzgx1bxggpLfcnBqLgUFGZBtiOAEareP7jM?= =?us-ascii?Q?BiLZ3Oyc9PwY8BF2b2eyoC5cpy/c697bc0Exy48073NPV47L42RIKzHS/bpQ?= =?us-ascii?Q?aRspQ6BNEihRM3e1VfKRVqAcwXIZyyjprfT5nUyt0kXwLJgKXPAxMvPXkPb3?= =?us-ascii?Q?jX4tG+Gt7KmzNQu/Lj1IXJOEi2uX0wDU4TURV4XAgV7JdGD4aPa3ikBlE0QN?= =?us-ascii?Q?PRnOXZtGSgGcFLaKO3mURLrI4fHRk/NznBMvcnV3UME2sxwVVUFoIygGYwCg?= =?us-ascii?B?UT09?= X-Microsoft-Antispam-Message-Info: 8+0+sg59vHrXa24+EU5GAt+Z0dTmyVCV9gYAg3PwWxHlQRfAfoWlonKPEcrNlmsnEe4eIoUrPd+3M1p44vOZjYiZ9+1zDaSTLAylQLCe0kktq9HMF3ntxVX36rF8gukPRThnInVO+DSM8VubVgczr6Y31WLpAmGVABiUUYt4e9ev47qiZQihxC36i2J50yPUH/nJ0QxGyKBq04LCZnq9RkFZJ8FYG9bKWeCkJKYD9+r8vUh9QvLx5XhV2wGLh4yyXN47j00v9a2gNlFZcrgQo16XLLtwsspgNEL+pIbCj+DLte5kcDk8Lo82lMHLzox+m5KSFKhJnZl7zWHo+6PlksWBdIQzXBx9WU8T8NECDYc= X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4586; 6:3R9yRJTWhNUxRMt6ym20moxUD3OCuBoHuQ3hvLDtr2zvFDn9CSCrPEBqnIPodcTPEvwJZZGWQZRDA1dYZGDCmYvEmV2fLPQ15j4ho61jyBODIAXOT8PbX5O51WQcz7dn3mWuqrWletB/5/knF9SyO57k9EzhFf4ea3ht5kp6gQevMrqTHJ4Vds4njX6a+T8TkkD+wcfvaT5JujDiHyNInxwbiiVS4oHVF67VmQchvEeZWXb4IZ4vU6BESzrcpKhWMFHIgj9dSHbsbiCOBtyyjOKDghECc+aefXiuavsB1MQTmidR1H3PYgBSM3y0aw+u8aeekRcBRoeWdqivqhBWIX9KZJG+imkPpqKOvoBZ1Gkeg60VS+krw4v99XjwgvB6GxFl7NDgWs0ZQa25u4QdH2BX4Am53M+BfzxInPwN1nP7tpZq54Yn/QXGOKCZ/D4s2/L1PRmoW0Kj8miM/IwXdQ==; 5:QTdDoDHvXhfocm4xgUUzPPUcfR6KAYMIwW22T4BpLE3B26rUL+f5YSftJ0bXMFFN8rnb51p5//lpoB+s7Zo3XggoiQViNxqEs0WUgcgI1IZXHMFVNH36y2EiG1IXxDzDJDvu0ypXDVgiei90csGL0Mv2Ob4S+c6pcw7nTt4e4t8=; 24:SUWDVdMOhrIM4WZycbRo1QsFfvgMduskB40O2LaH5uBie6obE4alT+WXI92yIenUlHZ2Ttpi3wQcL7zwNQFCNNJhcT9IPVz8aCuFemya15I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4586; 7:JBbhknFMYu3LYqndkHSzV8OiWCTw8u0DrB5+cAm94hse9CUV3uIU72iPwZs7Vzjm5EplYsOb2xP9Xe2v6TXUqR1iaFVLhgZ7N0kaPYKX36t02akOzuNjFs3M1bhVS77bVgdRXpPInTHSmEg6+By50xUm9mgPM1lwn2WfhsVCR5+5axsnmO6BDNY0i0LHf/UIyfvwwP4Ku5e0tpESBQ6FysEmn/jG/XMdNyRtPPYC+Eygiggzh5o9IFk1reXtJBoT; 20:wadjs+et1ROCqeO/p0y4Ft0baNobViWrBOQynjLi3sG39uzkLSlyPhh9B8Zm2/e/6OE3are/SlDdbTm4A/fJQJvzfCikk7Vvb/X0s5DkHbRGUnstMux18fwSp3trMtI8NtPG2uNlU+nN5FI3HB91dFDwZq85Zgg7fH3BY6ygGBs= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2018 15:58:44.7984 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86ecdec2-8db8-4a7e-ecab-08d5e1c705e7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR05MB4586 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 , Deepak Rawat , linux-graphics-maintainer@vmware.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Deepak Rawat A new param DRM_VMW_PARAM_SM4_1, is added for user space to determine availability of SM4.1. Minor version bump for SM4.1. Signed-off-by: Deepak Rawat Reviewed-by: Sinclair Yeh Reviewed-by: Brian Paul Reviewed-by: Thomas Hellstrom Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +++--- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 3 +++ include/uapi/drm/vmwgfx_drm.h | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index a67b54e4fd50..f1b803d34c59 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -43,10 +43,10 @@ #include #define VMWGFX_DRIVER_NAME "vmwgfx" -#define VMWGFX_DRIVER_DATE "20180322" +#define VMWGFX_DRIVER_DATE "20180704" #define VMWGFX_DRIVER_MAJOR 2 -#define VMWGFX_DRIVER_MINOR 14 -#define VMWGFX_DRIVER_PATCHLEVEL 1 +#define VMWGFX_DRIVER_MINOR 15 +#define VMWGFX_DRIVER_PATCHLEVEL 0 #define VMWGFX_FILE_PAGE_OFFSET 0x00100000 #define VMWGFX_FIFO_STATIC_SIZE (1024*1024) #define VMWGFX_MAX_RELOCATIONS 2048 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index ac6da0da2824..e825192ca30e 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c @@ -116,6 +116,9 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, case DRM_VMW_PARAM_DX: param->value = dev_priv->has_dx; break; + case DRM_VMW_PARAM_SM4_1: + param->value = dev_priv->has_sm4_1; + break; default: return -EINVAL; } diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h index 68ff37d4c035..399f58317cff 100644 --- a/include/uapi/drm/vmwgfx_drm.h +++ b/include/uapi/drm/vmwgfx_drm.h @@ -82,6 +82,9 @@ extern "C" { * * DRM_VMW_PARAM_OVERLAY_IOCTL: * Does the driver support the overlay ioctl. + * + * DRM_VMW_PARAM_SM4_1 + * SM4_1 support is enabled. */ #define DRM_VMW_PARAM_NUM_STREAMS 0 @@ -98,6 +101,7 @@ extern "C" { #define DRM_VMW_PARAM_SCREEN_TARGET 11 #define DRM_VMW_PARAM_DX 12 #define DRM_VMW_PARAM_HW_CAPS2 13 +#define DRM_VMW_PARAM_SM4_1 14 /** * enum drm_vmw_handle_type - handle type for ref ioctls