From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758602AbdLRNpd (ORCPT ); Mon, 18 Dec 2017 08:45:33 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:65376 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757795AbdLRNpa (ORCPT ); Mon, 18 Dec 2017 08:45:30 -0500 From: Arnd Bergmann To: Thierry Reding , David Airlie , Jonathan Hunter Cc: Arnd Bergmann , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/tegra: fix non-debugfs builds Date: Mon, 18 Dec 2017 14:44:46 +0100 Message-Id: <20171218134519.3042726-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:eonALH5OWfTgg5iDbrcmrprgT+Jm8gqK0iMo23uRWPKTJ2/8Oll 1r4wNuqtyof7wTUWNVr/dbmM0vehOiXY5D9Jp4Vkmgc/AktqI0hl65bXyy2+TTIvW6qGH6O 6aye44vv9pjFy2ppWoBOw3/N5dE1GgBFj13w5wypYSigEE9qYMia+AqumLEX1Nkl2xQw6ut QUXyc1489y/eiyl8AVXCg== X-UI-Out-Filterresults: notjunk:1;V01:K0:t2K6+yhOGPE=:W9eobkeCkOv7fI1rQ3QPAV 3g5drbPAcgcFqzTYpNDHFb3S4Xzkt9AFkrMnstKWmTGvXZd1qJuRWqyJIOyCt3UXeZyuQjIco l3cp10gn65KqCjlOaf/MeUJ/ZJeLWsZNcPFZPtJyMrqsBgEVBovLZm9TVIJ/eCTxN8qkaDpOC Fad1D1yHgruOesYNNp/7tSUDxifV90NtnPOuPVpcw5AJagjRP6QZ1fWHEWLhgWI7B7Dm61Iws rxBHivEimPDDz2FhSIiDgtuh4giL8KzlEGMU+vul2nNWSpI7TIw0sSA3bfx/u/wmISTe9rI7q 5zV0tAIm4nrycBVOI1S9d9ribGa34A1pCY0/KgTc0sYxf5gcw+mMUg8DvlLSnms5mjafxG+4Q FmFRuUn0FX+1kFPJGVuPoCFhroWBN+yjtwP2twXciDLfQ0zh7RO561JJAEQDXJCMCDkYOa6u7 yvkVXwXNhYIsWJZWfSUEWbLQ5kxOyDnC06VPl8Trer5w6IAocit3x2LVSGlSgMex36pMNcdyt ATu7TEVuvPa8/elOhdHAYL0m2CtNOhqXuNFbqGHyMgIWqOGDHiW9N0noCe9Sky5f8hiZU3cOa C42aJevTBFe2NfMak5UTDpFHns8p/0b4pUQ98RqK3iQxJLa9VV26ijqG565BrzH70DX6PpRjQ gJxwtaJ4CXv/s6rIickEOGydMxgFjBKkmJe3qRdfv+RVops21UCRetqrspSG9gxhO3sFyNHk2 yZkF2+B8fdvvWoMaUiBjvzwIzlXSiK1aJL3saw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new debugfs registration fails to build when CONFIG_DEBUGFS is disabled, because the drm_crtc structure is lacking a member in that configuration: drivers/gpu/drm/tegra/dc.c: In function 'tegra_dc_late_register': drivers/gpu/drm/tegra/dc.c:1204:28: error: 'struct drm_crtc' has no member named 'debugfs_entry' Without CONFIG_DEBUGFS, the rest of the function already degrades into nothing, so we just avoid the one assignment. Fixes: b95800eeef09 ("drm/tegra: dc: Register debugfs in ->late_register()") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/tegra/dc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index e963e40d8a25..e8a0cad5899c 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1201,10 +1201,16 @@ static int tegra_dc_late_register(struct drm_crtc *crtc) { unsigned int i, count = ARRAY_SIZE(debugfs_files); struct drm_minor *minor = crtc->dev->primary; - struct dentry *root = crtc->debugfs_entry; + struct dentry *root; struct tegra_dc *dc = to_tegra_dc(crtc); int err; +#ifdef CONFIG_DEBUG_FS + root = crtc->debugfs_entry; +#else + root = NULL; +#endif + dc->debugfs_files = kmemdup(debugfs_files, sizeof(debugfs_files), GFP_KERNEL); if (!dc->debugfs_files) -- 2.9.0