From patchwork Fri Apr 26 02:17:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10917975 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 C2557933 for ; Fri, 26 Apr 2019 02:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4C9C28CBB for ; Fri, 26 Apr 2019 02:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 989DF28D2F; Fri, 26 Apr 2019 02:18:04 +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,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 C7F8928CBB for ; Fri, 26 Apr 2019 02:18:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A939892C5; Fri, 26 Apr 2019 02:18:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22AF0892C5 for ; Fri, 26 Apr 2019 02:17:59 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 44qyPv3JfGz9s70; Fri, 26 Apr 2019 12:17:54 +1000 (AEST) Date: Fri, 26 Apr 2019 12:17:35 +1000 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: build failure after merge of the drm tree Message-ID: <20190426121735.54ff8785@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1556245076; bh=Qqgp1DAA42BKNh/pC10z5JxEM/PAd80YG6YdJcPqr14=; h=Date:From:To:Cc:Subject:From; b=DbMWvxV7pB7y/Ahxx5cLJ/5hs4Moo0Fk4ua4v4Xil/gah1YoPQ22I4VEMUMq0Qj83 5f9QZod6X5Kwu9tKC7adpCDaZ8wdFlwxAcMaOa5nj+25kusk+HsLkoYAXQHZKPRENR 59IEeG+RO0oe2Gme5A7A0zYUsOphR/cumUT4jQETPDshmab/SzCsAXC+PSJdcrG8xV 4cjwSJBN5CHjIWsiq3iEx29XAuFQmsfGShh0bWpFUBt7GMeMYdkZhOzuuEr3VJbz7W CWSv09tEs2YtESf7ytsJDAm+RMtGw59TRXyly1BcWpND8cD9YW0UZz0A5/l0oxIBVW y6qHiNnJnibIQ== 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: =?utf-8?q?Marc-Andr=C3=A9?= Lureau , Linux Next Mailing List , Linux Kernel Mailing List , Gerd Hoffmann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/virtio/virtgpu_prime.c:43:18: error: redefinition of 'virtgpu_gem_prime_get_sg_table' struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/virtio/virtgpu_prime.c:31:18: note: previous definition of 'virtgpu_gem_prime_get_sg_table' was here struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Caused by a bad automaic merge between commit a0cecc23cfcb ("Revert "drm/virtio: drop prime import/export callbacks"") from Linus' tree and commit 98f41dc3b3ee ("drm/virtio: implement prime export") from the drm tree. I dropped the version of this function from the drm-fixes tree: From: Stephen Rothwell Date: Fri, 26 Apr 2019 12:13:26 +1000 Subject: [PATCH] drm/virtio: fix up bad merge of virtgpu_gem_prime_get_sg_table Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/virtio/virtgpu_prime.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c index 0f670fc6c954..8fbf71bd0c5e 100644 --- a/drivers/gpu/drm/virtio/virtgpu_prime.c +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c @@ -40,11 +40,6 @@ struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) bo->tbo.ttm->num_pages); } -struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj) -{ - return ERR_PTR(-ENODEV); -} - struct drm_gem_object *virtgpu_gem_prime_import_sg_table( struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *table)