From patchwork Wed Jun 20 16:28:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10477869 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 8C0DD60230 for ; Wed, 20 Jun 2018 16:28:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C061B286C5 for ; Wed, 20 Jun 2018 16:28:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B51AA286F1; Wed, 20 Jun 2018 16:28:40 +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=BAYES_00,HTML_MESSAGE, 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 4F7FE286C5 for ; Wed, 20 Jun 2018 16:28:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39E1D6E5F3; Wed, 20 Jun 2018 16:28:37 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-co1nam04on060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4d::60e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 749FF6E5EE; Wed, 20 Jun 2018 16:28:35 +0000 (UTC) Received: from BN6PR12MB1714.namprd12.prod.outlook.com (10.175.101.11) by BN6PR12MB1908.namprd12.prod.outlook.com (10.175.102.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Wed, 20 Jun 2018 16:28:33 +0000 Received: from BN6PR12MB1714.namprd12.prod.outlook.com ([fe80::29e0:4869:c5d1:ef6e]) by BN6PR12MB1714.namprd12.prod.outlook.com ([fe80::29e0:4869:c5d1:ef6e%6]) with mapi id 15.20.0863.016; Wed, 20 Jun 2018 16:28:33 +0000 From: "Koenig, Christian" To: Chris Wilson Thread-Topic: [PATCH] drm/i915/selftests: Remove unused dmabuf->kmap routines, fix the build Thread-Index: AQHUCLO7fGnRH32bMUaMgdWGluOEuA== Date: Wed, 20 Jun 2018 16:28:33 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [2a02:908:1257:4460:ad48:ebbf:f8ce:211d] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BN6PR12MB1908; 7:6shCfDjx4+PCNosWo6G9nxVRDqFgcEfeir+x6/aThbX+LBm58deufNRqljrwreHcYutqzXNOVUxLnj29Q4ECpvvC0y9NJUtpVPmTigAeG62akiBU5rqZjTpsuQetqrY2YD5DvSd0ihyWIkNkXBT8IU3thFz45ST6w0jQlEXQVXiTgY6JbGjo/13DahSVsLISLt77jb9RTPnAtXOJ/nM9FYiy67wIUAgsojbGysh6gKdK9XamUl6+BxNPpVyC637N; 20:Qrg+5VQJAYoFbN7iaS4KDGaw5Hsk90xStHQByqZWSS4wIGhpAqZ1ymQc4nB7TjmEk4l6RZbyicRrjHsiI99I4T/amCYuZ4mdFL+ZToVdwIaXOzX540YYbp9JkZgVrv73tphhtQzaS5Qc4c2nLpVdqcISlbHLcw0Odv13YyIneLkPqA89azuVyAewgV51aItBPgCV4Nge/pZz3TVmcVyvSkRWeOzFfxQyO0D7R08dq8g4pto5XAZnkdO0OqUQlLF2 x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 871f1a1e-a74b-4929-4d7d-08d5d6cadddc x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:BN6PR12MB1908; x-ms-traffictypediagnostic: BN6PR12MB1908: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(767451399110); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:BN6PR12MB1908; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1908; x-forefront-prvs: 070912876F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39380400002)(346002)(366004)(396003)(39860400002)(376002)(189003)(199004)(6506007)(486006)(6916009)(54906003)(102836004)(186003)(316002)(2900100001)(68736007)(476003)(33896004)(72206003)(3660700001)(5250100002)(3280700002)(5660300001)(99286004)(478600001)(46003)(4326008)(81166006)(25786009)(54896002)(6512007)(2906002)(31686004)(106356001)(81156014)(7736002)(6246003)(305945005)(6436002)(14454004)(9686003)(86362001)(53936002)(8936002)(229853002)(6486002)(8676002)(105586002)(31696002)(97736004)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1908; H:BN6PR12MB1714.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: V4ql9EaOKMeaWTkcHZrtxbTc1kUm66unjSItlUmJA+bPb8ecPbKcQMSWZOYAJ8zVF9zapLy34SiaYVt5499CrEBulaj3bvr7X6qFKoN+KBO/u4/RnZiDLZHuzV1uhHEY48YlzJPKOiCrI8YPzU01v4NVlLauoyccE8Iy2ayROgK/UpEUojrAuR63jaO6Dje6XpeRBCOYu/kFeYJDuo03AsiSaVG1pCbG+RXuwzNEWI1sNaP4sWCacew10XxEWW8HXvXFLLpFoWxKGKXB8jdU8GaEKUxo3ZgbnlZ3gbzzI73+aJqj2obRWQpdVlkFc35G2caVSu7/XFKb9IoM28znog== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 871f1a1e-a74b-4929-4d7d-08d5d6cadddc X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jun 2018 16:28:33.4311 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1908 Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftests: Remove unused dmabuf->kmap routines, fix the build X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , "intel-gfx@lists.freedesktop.org" , Sumit Semwal , "dri-devel@lists.freedesktop.org" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Am 20.06.2018 18:22 schrieb Chris Wilson : Fix i915's CI build after the removal of the dmabuf->kmap interface that left the mock routines intact. In file included from drivers/gpu/drm/i915/i915_gem_dmabuf.c:335:0: drivers/gpu/drm/i915/selftests/mock_dmabuf.c:104:13: error: ‘mock_dmabuf_kunmap_atomic’ defined but not used [-Werror=unused-function] static void mock_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned long page_num, void *addr) drivers/gpu/drm/i915/selftests/mock_dmabuf.c:97:14: error: ‘mock_dmabuf_kmap_atomic’ defined but not used [-Werror=unused-function] static void *mock_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num) Fixes: f664a5269542 ("dma-buf: remove kmap_atomic interface") Signed-off-by: Chris Wilson Reviewed-by: Christian König And sorry for the noise, Christian. Cc: Christian König Cc: Daniel Vetter Cc: Sumit Semwal --- drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 12 ------------ 1 file changed, 12 deletions(-) -- 2.18.0.rc2 diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c index f81fda8ea45e..ca682caf1062 100644 --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c @@ -94,18 +94,6 @@ static void mock_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr) vm_unmap_ram(vaddr, mock->npages); } -static void *mock_dmabuf_kmap_atomic(struct dma_buf *dma_buf, unsigned long page_num) -{ - struct mock_dmabuf *mock = to_mock(dma_buf); - - return kmap_atomic(mock->pages[page_num]); -} - -static void mock_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, unsigned long page_num, void *addr) -{ - kunmap_atomic(addr); -} - static void *mock_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num) { struct mock_dmabuf *mock = to_mock(dma_buf);