From patchwork Tue Jul 25 15:33:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9862309 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 EF567600F5 for ; Tue, 25 Jul 2017 15:34:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E739928680 for ; Tue, 25 Jul 2017 15:34:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC22328688; Tue, 25 Jul 2017 15:34: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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM 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 7D72028680 for ; Tue, 25 Jul 2017 15:34:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB5686E570; Tue, 25 Jul 2017 15:34:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7250D6E570 for ; Tue, 25 Jul 2017 15:34:43 +0000 (UTC) Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lvg2y-1dfaEN1vfo-017V8V; Tue, 25 Jul 2017 17:34:07 +0200 From: Arnd Bergmann To: Xinliang Liu , Rongrong Zou , David Airlie Subject: [PATCH] drm/hisilicon: fix build error without fbdev emulation Date: Tue, 25 Jul 2017 17:33:25 +0200 Message-Id: <20170725153403.121302-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:UVtiM+f9gQeE1i4iAlbc88935mbnXt6V7lsSmXI3WZ6rGscEUad 7ED75R0a8Mv1QpTqE3d5fUIRm6DHjyMrJiogOM+ogt6FzneL+V+Nhgc6N0qOK5I3Gzrj5Z/ yATHwbFlzW2e8Hz9fdHUwuui/5Q6/BLhT7b+FTuD1Kw6uzyk9IoOXaxcG9Unggzrd1iQ4od PzYSTWhKb0j7NzBlaZ6Gw== X-UI-Out-Filterresults: notjunk:1; V01:K0:d9xDyNwbtMs=:uDG+PSE7ctJ0hx4Gc3Mycc p6NbISnqthFxNKRERHlfoq5/UlUVP3ViBmzqGRVq6R8paiRwb20VGXbiHiSkLFFzNH+IpzsQe 6hgbivKcCNQ+ixh3fFiPcboVdvLBrTMOiELdLbEZPSUtUf678WSz4KuUnzuyqPk7iRctMnEpK IMTaH5yKINyJiayuVaetWgKwBN0y7wQ8jj+rMqO7cZAmOEh2SGegolMJg1ntVzxTPo6oE2LrA v6nO2VYwgq9MUQW5/Uu55gBKw5aaavRqZHYnAP77Jfh5BinLqVjr2Nz+8gvx2d2kb9wa0xda5 BStNhmcd3W20jDzWKFkOOXi9ePjxTWlXFYq5vkI8QseD+850bELcMlsPk7BkqukgAQ7CSv22e /Zvn3vuIUECQUMm4g5iNGUChPZptGBuStQySG66mqHusOrvDcdaJ5pWbUoVbYq5yRKjs7/k+m Ow/goATcZNis0Q5tdqJtVfMn4ss+WG7cV5hQ+qidRJOE12c5Zafxuar48ueqO8jCEp8nP5E1G sn0u+vA/3qS/FmzL6SL+HJh2WVaf5crKpQ6CXv15aBKSZUbNLfn07+7+rYlyhbdfvuGcVrG01 g/vDccusagf2k4+LrrytGDIBunVqdAqqkLl+YSZ8mJzrlOXZp9oFkPatHc29ry1IO7sl4UArN A7zkpQuJtoFJYd64YqvdpiGz8MRfc4jUEs9ul/7uHuFDh0jSzRVfOjhpUFn1coN5If+3MDJOx Oxms9t9zWqP3k1Ev6YrI1UtqhtnXTsncYguOpA== Cc: Arnd Bergmann , Chen Feng , Russell King , Jyri Sarha , linux-kernel@vger.kernel.org, Xinwei Kong , dri-devel@lists.freedesktop.org, Daniel Vetter , Thierry Reding , Gabriel Krisman Bertazi X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP We cannot reference priv->fbdev outside of the #ifdef: drivers/net/virtio_net.c:1881:12: error: 'virtnet_restore_up' defined but not used [-Werror=unused-function] static int virtnet_restore_up(struct virtio_device *vdev) drivers/net/virtio_net.c:1859:13: error: 'virtnet_freeze_down' defined but not used [-Werror=unused-function] static void virtnet_freeze_down(struct virtio_device *vdev) Since the code is moved into the main probe function now, this adds another #ifdef. Fixes: b4dd9f1ffaba ("drm/hisilicon: Remove custom FB helper deferred setup") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 1178341c3858..d48102d1a7a4 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -121,6 +121,7 @@ static int kirin_drm_kms_init(struct drm_device *dev) /* init kms poll for handling hpd */ drm_kms_helper_poll_init(dev); +#ifdef CONFIG_DRM_FBDEV_EMULATION priv->fbdev = drm_fbdev_cma_init(dev, 32, dev->mode_config.num_connector); if (IS_ERR(priv->fbdev)) { @@ -128,11 +129,13 @@ static int kirin_drm_kms_init(struct drm_device *dev) ret = PTR_ERR(priv->fbdev); goto err_cleanup_poll; } - +#endif return 0; +#ifdef CONFIG_DRM_FBDEV_EMULATION err_cleanup_poll: drm_kms_helper_poll_fini(dev); +#endif err_unbind_all: component_unbind_all(dev->dev, dev); err_dc_cleanup: