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: 108655 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp706609qge; Tue, 25 Jul 2017 08:34:52 -0700 (PDT) X-Received: by 10.99.148.2 with SMTP id m2mr19968219pge.291.1500996892423; Tue, 25 Jul 2017 08:34:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500996892; cv=none; d=google.com; s=arc-20160816; b=NEtBVlDFrdnqhjJKe7HUyxrJ17DOx0vMglm5mEwb2QOU9TiFZ60eFQp11e505BdPrw 6omdnSfcluCfyOmFkCZa+G81nkWe7Y87ehmVezlj/edWZA0+jF9uFPuFf1d/9ltUZN9E XTvZ0PYsOi6w7+rVYKiDZztz7mtsAsfz84kQA68Q/I8+5ntHqznWQNKG9Qtf1prEuFwj tluhJy4+HuyYUtBgEc/gM+mlI2TuHY1y/aFj1GXNsdCDOC9uL4w1PYw2TsjVcVV1yPzF 1lM/POPRbDyvuIVxUI0+svE9SdXWltpxx/+9p6B9uE40QGGEU/5OENNl3HcRCHQUY/05 9R0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=R5smqMu0xCnkLXB6R3ovdcOvNUHCXNhHAK6Cw6GKmEg=; b=HazMAT08CjmWwg0TvJIStgQoyv+sKHab5yFipT80xBmtX1gUJ0xOiYzyUI0uMXEZtv aAPRXzqzL/SnJqYBLAGemntIxQWBkI3bmYnwJK+iaOsDpQilq3saM1yr/leZzbOWnd+n t1F6RnTpW4hAAgTYb3kccHboqo9J1THRXMZah06aKv5wOgRX+TUnwOwCaj4Zj2pzFlJ5 tDc2OlyaOjllQGH01PZ/wzpMaSyNx6z3czh57XIYh4WuraZ6I0nGMHTOsDXRW1g0TQ49 lkm3VnQczWTMeMRBHgLY3P3WKQ5fPf4NJd9r5LGIXKb22f0jtBGzp4LjNdXnnTQZ8/ag jmCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z59si2554709plh.873.2017.07.25.08.34.52; Tue, 25 Jul 2017 08:34:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752667AbdGYPeu (ORCPT + 26 others); Tue, 25 Jul 2017 11:34:50 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:61873 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752156AbdGYPes (ORCPT ); Tue, 25 Jul 2017 11:34:48 -0400 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 Cc: Arnd Bergmann , Xinwei Kong , Chen Feng , Daniel Vetter , Sean Paul , Jyri Sarha , Gabriel Krisman Bertazi , Russell King , Rob Herring , Thierry Reding , Tom Gundersen , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 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: