From patchwork Wed Sep 26 16:18: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: 10616141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FFCB14BD for ; Wed, 26 Sep 2018 16:19:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75ACB2B3D5 for ; Wed, 26 Sep 2018 16:19:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A30D2B3DA; Wed, 26 Sep 2018 16:19:26 +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 1D0442B3D5 for ; Wed, 26 Sep 2018 16:19:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CA546E4A5; Wed, 26 Sep 2018 16:19:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-bn3nam04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4e::61e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8240F6E499 for ; Wed, 26 Sep 2018 16:19:17 +0000 (UTC) Received: from localhost.localdomain (155.4.205.56) by DM6PR05MB4588.namprd05.prod.outlook.com (2603:10b6:5:9f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.14; Wed, 26 Sep 2018 16:19:15 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org Subject: [PATCH -next 09/18] drm/vmwgfx: Remove the user resource destructor check Date: Wed, 26 Sep 2018 18:18:30 +0200 Message-Id: <20180926161839.4549-9-thellstrom@vmware.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180926161839.4549-1-thellstrom@vmware.com> References: <20180926161839.4549-1-thellstrom@vmware.com> MIME-Version: 1.0 X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: VI1PR0601CA0020.eurprd06.prod.outlook.com (2603:10a6:800:1e::30) To DM6PR05MB4588.namprd05.prod.outlook.com (2603:10b6:5:9f::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4defb9f-19a6-44c9-dd14-08d623cbce29 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:DM6PR05MB4588; X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 3:CfKVbQFCOiLxA+ImCz1orzru/8Wg/KvVfi339lkcb0kF6bJ+Wqd4JsNTOXA2s0yJVqCp5cyq7zbLoJVlnzHzxrYr5+VMXdcTLw9n59B8xEujsBP9Cygjpcs5cz33f/Xvhjji77gQY01LcLjmElce/Tc85teaZSUCFBsV/QWjtpcZKhY5YoUPuxtKAHLX+mvUQneJlOvAp/6X0nlY0GoaakWNA8VN66HDYVidYnhGQSiC17ihRZiIWvwBDhp81QXP; 25:hpxHdurbnw0Dra42GEB7gT8x7CA/n8DXaA/5abHFnrWj8k8hdcRisC5FUJEfZNiGm24anqHjBX7nRPp2eCPakp3tbZ5tZwQ6snjIV5LnwLm+pCLpkV2fOsv6cBjnZI+H20q6qOkM/jSgX7ai9CDbS4FGKXRrGmPoj/E1mf4tEEMvJ7FwefwL8w8B2N9wtl+NTiHoumQ7DRTtoD7KKmpLSsfMlbQKyPoZC04salp17Qohl/2dhos7dCNZJF5SCyahSL+FH+f/sKsoVBnsvdDX0wBLNjr8hjywjuPISVZDYbNVARm/nG8v+0z3YQPmFvslg/YdPbuU3Jpp6r34zkPu8g==; 31:rlWBZK7Q2/PJEej0/v2oMUnO9XPweAm6Prd9c3+voxyFZUpcOEQd7AIT3WLUzw73VXlT/W3A5YjJoiiA7rDM7wI/4WwJdpWbHMuG/8t2VS+1kBeYRoRUm1lYg+48Xwuud8tZHzQ/AsjVPSvqgI7E/PO2Ob9jp2ciavGbpL4KTV8svORNqvuVT5O9m4OZksP+X8LnR574HGSUbqB6dOjfRhUMqJoZ343s3elu5dsCWjE= X-MS-TrafficTypeDiagnostic: DM6PR05MB4588: BCL: 0 X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 20:SE+s6qqbJ+mfaMx0uqeIAPCQw8JAGlgolQO/jhiP2qYU9OeXwYKB8RSMJApMVD46pKHWKexiJ5ZKcFvLWTfZDKPhq+Pz2rJsFzBVt0/qG6Fw2Bw2tjIgAHTSsU7vTkoTlMLytWqDYdKrlwwDHuKeZ7WyKPw9IcsXIUHUuUnqAauJnCHYJ3K7t1e489Lar5De76AIWoe2/MxC0/HFxkEyVESm1Zod5uFS0Cvai9z2Yxq0Ail2l4TdEX7/lo7qkkPFz3XmIUY158tm+mH9i+Z8CE5OvlhwannIIy+35Rtvh0h6T8evV456f9eMWyhqiNPtJIZgg7v8bGUykUGsQMDzy9n/Z6uH32TJx2TJkABUGMFFs+tWPygVImNCM95TjnOg0kQfDjwbO2eIUZROsVMEPDS11isqa/lkI9hb/cdBXGF98AGGDBIE/NC2DaZn52fE7N2pFVXRnw/6goC+dpC1lT+RFonaMtLm6BJXsRP/Dk5N1InGDxR64nCHMa3YCYaLDbLUJ4CyZZXtsY5JD0WHXObNkpfOx9sEWMnKmFZO4rj6TvyL3mllpDHLpUzXYg8qvBiqiS/nYbBrlHqZ7tnrL3+aa2gwMumv9kFft53qCUE=; 4:CnsatrM6qwAxnz3vPpyx5262EHJJ6x+0Jerljfvyl2SWYV8HE/08qpSN0zODMvZoLBMlaoq1e2yEGnpPNs1BC/sVeKClQ4w70rPRqBVQ1KpC6bHh0k7AQXZoLfkrP58Fk6THtYg2pw2k9uiZTR1tto5nzvE5yzHrql0fxiTCqYyEfuue4uMv4seZFeBVMtxfYq6bUcK3X2QuZfCTT7czHWNjHDabhDEiMNYP2vwFU6PVvlPG86N5QxV0O3UUjJLbkZWtVGkVT6iRbs3Pi9Jz/XGwsVZnhG2CKsL+sXYyONE07uiuntLNNo3XvVj1uT6l 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231355)(944501410)(52105095)(3002001)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991041); SRVR:DM6PR05MB4588; BCL:0; PCL:0; RULEID:; SRVR:DM6PR05MB4588; X-Forefront-PRVS: 08076ABC99 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(376002)(366004)(396003)(136003)(39860400002)(199004)(189003)(11346002)(186003)(105586002)(36756003)(47776003)(26005)(66066001)(6512007)(2351001)(305945005)(446003)(2361001)(486006)(16526019)(106356001)(7736002)(5660300001)(476003)(6666003)(53936002)(86362001)(6486002)(575784001)(97736004)(69590400006)(478600001)(68736007)(50466002)(25786009)(8936002)(316002)(16586007)(48376002)(956004)(2616005)(386003)(76176011)(6506007)(3846002)(6916009)(51416003)(1076002)(4326008)(8676002)(81166006)(50226002)(6116002)(107886003)(2906002)(81156014)(52116002)(34290500001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR05MB4588; H:localhost.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; DM6PR05MB4588; 23:/9UmQAkWW7WWyicHmdtQAV88uBiPa1UIpbzMtoG39?= oNw6RFEeBKiUwICbBoT29TY6xVfcTg1XbsXjwR/dvZeMyW7I28hkwtK3+LUxlCBKA9eStw9bPx3/+G8GeVNupsZyTNnzCBky85GPhexY7C8zcEK2XJEHVor4jbY1y0Is7fq5s2VMIAkWkxkUtT7CxP+rNi9751oUiKeFCWLI0nHgGDQhyv46/ql5T27FJEu/POAz5HEQ9m5wlgXY+j7C1D1FHkcPj8i1WJEQtiGpmhXEKH+3ZLRdCKHmF+D092mQjZ3uiUMI0pxgjo4A+9ys+7TYJ8ny2j6NhBc+Hg/AH7ZcjPY8KncDDF1doMpitCLu4FvDccAP1wecBJpC6I+iy6+VpG+KSOfoPU4e61tXRIPk55GcmNd82EATMc5U3a1hPyDinOH6uMhBBcyma1O4B+z7yngu5k2YeKVk3/C7XqKfTI0DmK9wvxkdF6i4Z/UtHrgTWo5Fme+W9vfi/ZTKTIywcNVSSH20UzuuaNNgicuUoQT41E/CYW+zcbpCoyjdkEi44g8p8gW6Y4ANnCX2R/r9ZM/U9c7M8Z1zYzg/CwbPanT+shDzaUv/iSG/Of1yXZv3lYRESy2pjTqgDxxGIGrWijtBGqECZ8blVsH+4zmvoidV9btdqlmmfRtiR7kioJ4a6998z5qZL6a8DUciAP58UOUMJmWgI7N5cl8nEQQ+s2OdIk5oKU9u4vWOQicwVq6YB3jcmbEAeXxrAKjcALCaCZKmnVSp4/YIK3e0BQ6Tj9Y0Z86XhmjYQaf3JvhYT7M9inLuKhUBgQzvb6lGqMPQKUIoK/g+aRTvKGgw7B7W04eBuU6nppPd8Ae1AGwtvtv0UoRzHGUKUpkm4LQeFRCLjNKnxzjRI7NLLW6DG02wm3UrybxQr00jCqykVXE8QWogP7ppMesujHB20GdXUgsFMgijnEJNA8TN+b1yPKSHp3oliHpzUC2UaGqabloarWZpnrXs808mkjhcSUyVbKKbBHQ3oavrK0B3MSktI6Ms7CjVBsdN1Hp6/kvvZDFSs0yoFyOUP3DoiouVfWQ3aTjdd1vMj5R4cAnoUOQhstg4bo6CPkOT935PLz5c25n+MNx+9toi0Fc5atQgLbAmQIefllNAzTD1M/Z6vGttk8sa7d3/K25vtqervPVGtRbzfWcDzQvUyfwYwLW2l7tOb11qCxTcRFDqb1Wa7LvBv1ULp8Yj+tH3SH9CWBqJrSti1Ga5Z+thtaupb5DEslQASHgN5MJJpZTnsjPy2jlakQd0twblLvuEuoJw3LDx3otkpuE4+KczPWP8pnPXxjGTkjOrKtGIz1+VbpQJbyWbwF7cA== X-Microsoft-Antispam-Message-Info: 8uT5/Ef1cih0tJbLmVuYGcN8GaTc+ByHXFgAyOsK3e7L7U+Q+aCLb7R1AJ2wQI/XQcplXEAKqtN9vLgmGKu8YPzNo3ihWJpvGO0a2+Pg3fllbIDrGh79y7DExUlJ4vyhlXdb7SiGpXLCrdHbd2tp5sD5sSWhzaCid3ee0AqTeh4M2S0IGDZUQsYOiQbQMPqTXbM5avGPtIYg6wH1fjz5Osc8MreZM90DtUDjzT95aw9iUrbymeptlBFfRPFQKkpA0RYXm6codv9IxcDKG0LB+BfWx+W/EGtJmVT7J5/dm8IDA+bglvMqRfpMIQhCvihir0e+LN7TH8XG8oPRusMFEwm5BVQRjszK4ywVgbWAk7U= X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 6:wgvkQSZu+8etyVeOjBP9ctvBo5qu+XBL/qFRPjkrtoqvi+mlnrvG1cCuERmZVvz1Cm4h+BP9M1K7efikoQpXCZnudlEWpJRzowmMrwc4aAOCPqkEfNx8b8qqwAgcBauI7nloak4/rXKl6/reYMU8TzeuubTP7/j/wizFu99QM0Q7OgQECKWu/LihEJKAIDVoob0aoHKUh1sc5XEljUFTD5wlmAvPubdlBKF7kLC9jiqQ/DYra5+0Znz8LsdzIcrCrIYLBEFaQJ6Voj+5dFd7dP04x7bcN+S70jRzJZ1Z+QCT4oc10rrwRhjkwb2oOWnYVUSYPXs2BTfU685HCa9ioJtos/oc9J6fWG1vMQv2OZImTWfLoqDLU45OiCNE6Y8ml3ls446Aq9No6wfs0rFgOVXQBJWvZmoZn4kcSkqNzlDKjTr/+Y+8w1EAtwBQCp+UrCKd31z857mH+ZMPCRInwQ==; 5:l5YMIgIxN/XIgFg+hBa4f5Xr3Ckx7nut18XrbVFgIdqy5RpOXYtoQtsHAEVgteJdTAAxOugDStxJEriUSh8grM/q7wdO5sTk/15uvGRY8JgV/UZZU9ys1eiJLexfNVaAzUP3Bm/c3XGIhNMgMirQX7h36QWsheRK5JolzhdQr/Y=; 7:aZJWPSRNNE6oZog6kKbztgHb1GDSXu+v0E9x9dU+izoQDX4b1qtGWE79hoRdeNUzTL3IJ+KZf+3Hf340gPvliPtSvaYdX7gOxP1LlDB52z8nL5009xsrI6Z8+Q9DOe3CF2F+l+QUD12SkJU3BTei9ICJgfb2DrDE9wGkHGe10+YbJLL4eJprS79R/KkZS3p19ZN8P78Jfc0A2UOBTnasc4RbbkF/A71wQbfEQBcAhLt9Q7gdvxqjP7nsrpZ7IzGO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM6PR05MB4588; 20:YZ0DKw0Ty0uPMrvVhr5yUOmQ4DmcH/Qsi1TAw9i67eEcNiy/tNJVsTtDwaSNAGEXn7j48bK+I1JuzzB9ZCM/vsti/bUCDrNbKPiv4fSXGhxTJLaHlKYC9ZxZ1fcpYAbaiQrBC0XoaZS8JG3iEdJQvgImv/IqK5AtAtFiiXbdyKQ= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2018 16:19:15.5311 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4defb9f-19a6-44c9-dd14-08d623cbce29 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR05MB4588 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 We were checking that the resource destructor matched that of the intended object type, to make sure the looked up resource was of the right type. But we already have an object type check in place which makes sure the resource is of the right type. Signed-off-by: Thomas Hellstrom Reviewed-by: Sinclair Yeh Reviewed-by: Deepak Rawat --- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 55df79eccd57..cf48d0b157f6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -219,9 +219,6 @@ int vmw_user_resource_lookup_handle(struct vmw_private *dev_priv, goto out_bad_resource; res = converter->base_obj_to_res(base); - if (res->res_free != converter->res_free) - goto out_bad_resource; - kref_get(&res->kref); *p_res = res;