From patchwork Mon Feb 26 09:49:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 129622 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp12714lja; Mon, 26 Feb 2018 01:49:52 -0800 (PST) X-Google-Smtp-Source: AG47ELtuGglwS4SWuJ09EwT7x1qwLE/kA7KYdXwYRJ5a9F1+fIjbD01RS6NM+4WgCOTUvroy82cf X-Received: by 2002:a17:902:b691:: with SMTP id c17-v6mr614575pls.308.1519638592393; Mon, 26 Feb 2018 01:49:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519638592; cv=none; d=google.com; s=arc-20160816; b=At02bwapcglb0ggGe4UBbWGlWRks8U0fJC7VTZqpVtDlgH1xZY+pm/g+v0En4vKazm kmcEAHYAaN0jlw8x8pKljt6Xv06xdkwgoW//UqUIoruAu5TjUueA+ljZecibz3U09W1Z xPlTrNT7tl4dsJ/vFmfS7c8t99HL5imdybTIQdxkzifJ1PF/PyulCG3fDvlmXatc/36m e6nNzevygcT77r69KgjbrLA6bDjYqQj/fNidZvNlg/pYIWZHh5wlX1QabKs2HsSCnu/u D7NL+xgS3xH4S4ff4HS/Bhrcoa83KNWbSrgZAU1K0SqOe1se+BZzWoRcnBjPCGItY1Vk 9Bsw== 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=+CCAGhkpS8I+zjcoeLNfjWQKAZFDQNn/QgFCyKxQMhk=; b=KCL2RS6z8pr8sXpLcP5XbqL0xUDBFwUfbssKAJEjv6ZF9+4XCpOjV4wELRf5lIUmA8 OkicVth2fw3Gk/SdEdv/tZ3Y3FmLg90WP8SjJpr/jJgMByUe0yDA5HCU+T7OXdeJ+maW pYAT+ok13AFVJdtoyVapbBHi0yJ3rWvqogbzH9DE/3ennnbD8XbeuPzOz6Q+BU//LUXK IA3KkMAWCYIdu3w7pAkQQb7EEOTUKjIpxRlldT4JAhSfJ5vFuC6OuoT7TSAVtlCkhSUy l4jzkV2RdekifLgVYb+2gVS3e7xXXgZ5l80S6nevyDfK3eKLaZh4D6n+WNNkVl9W/Zo9 M1uA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 m6si1916049pgu.633.2018.02.26.01.49.52; Mon, 26 Feb 2018 01:49:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752096AbeBZJtv (ORCPT + 10 others); Mon, 26 Feb 2018 04:49:51 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:37659 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112AbeBZJtu (ORCPT ); Mon, 26 Feb 2018 04:49:50 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0MhrpH-1f2XV04Bwx-00MuKR; Mon, 26 Feb 2018 10:49:42 +0100 From: Arnd Bergmann To: Rob Clark , Jordan Crouse Cc: Arnd Bergmann , David Airlie , Nicolas Dechesne , Archit Taneja , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/msm: fix building without debugfs Date: Mon, 26 Feb 2018 10:49:26 +0100 Message-Id: <20180226094941.2783405-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:kkfEgG/0yDhC6Ll1DSQYMwQSd2hVPBgQve1rK8+WNb9L2bn036O 7ZaWW+T5I7J/1JnhrnWYaVOc8dcaF/yb4+NYIosfZyEqK5AP8oJq3Rxh13GKGDiUuczkCmJ irXH5FkOhDrtaR3TzI+Sa5JuWiWSiAsJsfaTIwkcuBuNHxIq0i49aDLdBo7hXexdbThklCk OLEEutuxGBR0a4EArrueg== X-UI-Out-Filterresults: notjunk:1; V01:K0:IgcO1iWzomg=:dWle4ckDBmPdeSy2QqCW3i kLzfIHc5I/B4mu85XQi4pydmfwv5VPb+XlCFQsgGrQJN7Vk1FlpMSx5pPZ/wITKF6wwzTf4dQ hvwJANmI6zVpVSsgld5RXr0iyf/GQXpkOaFunfcCaWh9W6dmW9rHze3K4lWzpqiKXF3dc+Kw+ Si9hRI0P6ini8EP1VeVegnKJFUCCc2Kjv3cbPUfR0C+HXdHMFhN5cGnSG4FLt59qEjfKvTUpa rKIPrh8Z2pAHJ0qbGyKp+uyjTrXZmHdGfqrjbEbfCnctElsHHHl1oRVYo5Na1/pImYmTv/mJR 5WpMq3BFSOGg94BLqRJSV2yoA2ZJQa1TB38TaG9VhUoQyMkLbPQevZfgmMBEEC5Gi0uO/WOal kH4Q3i88SlnEPwmAcTTJ08bANrhJdJwd//nuFBTt/zmmknE4RvH/qRxJyCwAnDoVRsGUoSkLJ TAs2U5rFM1afsie9pscpAlaXT0ApCSikoGhcjK6x3uL3MM9qFM7mJjCAySXDbSiw1w/qPhmdv 7hcnbcpaW0K1Ab5JKNLBawalXAKkTySBUOJtm2ChRj09aFjwQaFVeXoP+OMrhBz9IB6mPmh9R kSzSbuVCFFtgbrEHj+SSjvwX+8V+kJtLNurRCWuiKH2yIEUnq+NRIygajLigIJ4sUnwp0igF2 vED7mUmluR3MOf+Dj7/OqYzVDepTzjuUOj8clmJvXkZ27ehmUFb3CNY2qEdNM8esU8vPzDfpk 19hW5QApHRluSB/pktfN9fcIth3H50qTFgfumg== Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The adreno driver stopped building when CONFIG_DEBUGFS is disabled: drivers/gpu/drm/msm/adreno/adreno_device.c: In function 'adreno_load_gpu': drivers/gpu/drm/msm/adreno/adreno_device.c:153:16: error: 'const struct msm_gpu_funcs' has no member named 'debugfs_init' if (gpu->funcs->debugfs_init) { ^~ drivers/gpu/drm/msm/adreno/adreno_device.c:154:13: error: 'const struct msm_gpu_funcs' has no member named 'debugfs_init' gpu->funcs->debugfs_init(gpu, dev->primary); ^~ This adds an #ifdef around the code that references the hidden pointer. Fixes: 331dc0bc195b ("drm/msm: add a5xx specific debugfs") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/adreno/adreno_device.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index f07d3ec7d77b..8e0cb161754b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -164,11 +164,13 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) return NULL; } +#ifdef CONFIG_DEBUG_FS if (gpu->funcs->debugfs_init) { gpu->funcs->debugfs_init(gpu, dev->primary); gpu->funcs->debugfs_init(gpu, dev->render); gpu->funcs->debugfs_init(gpu, dev->control); } +#endif return gpu; }