From patchwork Fri May 3 14:02:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2517161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 09B483FCA5 for ; Fri, 3 May 2013 14:02:07 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UYGYn-0003Oy-BV; Fri, 03 May 2013 14:02:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UYGYk-0008GS-Sv; Fri, 03 May 2013 14:02:02 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UYGYi-0008Fa-6C for linux-arm-kernel@lists.infradead.org; Fri, 03 May 2013 14:02:00 +0000 Received: from wuerfel.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MAywa-1UiCik37o4-00AZ1m; Fri, 03 May 2013 16:01:38 +0200 From: Arnd Bergmann To: Thierry Reding Subject: Re: [PATCH, RFC 06/22] gpu/drm: host1x: add dependency on Tegra Date: Fri, 03 May 2013 16:02:04 +0200 Message-ID: <3432070.tv7Jup0G8r@wuerfel> User-Agent: KMail/4.10.2 (Linux/3.8.0-17-generic; KDE/4.10.2; x86_64; ; ) In-Reply-To: <20130503134539.GA18652@avionic-0098.adnet.avionic-design.de> References: <1367507786-505303-1-git-send-email-arnd@arndb.de> <1367507786-505303-7-git-send-email-arnd@arndb.de> <20130503134539.GA18652@avionic-0098.adnet.avionic-design.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:o/uwgSLwEwoha/XUvQqm6QBJK1cfkojG84G22oSxI2b 1OJRswf7ZQmvMhD9kVn8MAqUPSxbYGJXhKJ2TuzsmQrQBOAiDH 9skg3vyKKnPm29HeQG+lPJ0NqkeTb40PTnhGmkcPHiDkEJEqAv oYAazYFqIl7RIWAz138Z6Hy+P8oL/42L9vVzSiZP8WWvLw+zbH W9C9hib/H3FBS2TguExzxibNMiuY9U9I32kxATr0XcP7Hh5dKs 0+mGt1FzBvtam6/n/5mSmf1Nbg+q87rVaCbKVyLYxVMAYtyFdn PgMwiYWh15pjUsZjaYzPjCndnGaAcmjKIWLvPx3yLqwqqMO+hO K5BdhdPDYpwzitO/DkAc= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130503_100200_488143_E9CA8543 X-CRM114-Status: GOOD ( 11.09 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.9 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Terje Bergstrom , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arto Merilainen X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Friday 03 May 2013 15:45:39 Thierry Reding wrote: > > diff --git a/drivers/gpu/host1x/drm/Kconfig b/drivers/gpu/host1x/drm/Kconfig > > index 69853a4..5a6a5cd 100644 > > --- a/drivers/gpu/host1x/drm/Kconfig > > +++ b/drivers/gpu/host1x/drm/Kconfig > > @@ -1,6 +1,7 @@ > > config DRM_TEGRA > > bool "NVIDIA Tegra DRM" > > depends on DRM > > + depends on ARCH_TEGRA > > select DRM_KMS_HELPER > > select FB_SYS_FILLRECT > > select FB_SYS_COPYAREA > > This was solved by a patch that went into Dave's DRM pull request for > 3.10 by adding: > > depends on ARCH_TEGRA || ARCH_MULTIPLATFORM > > to the Kconfig entry for TEGRA_HOST1X. The plan was to eventually remove > ARCH_TEGRA from that condition after 3.10 since ARCH_MULTIPLATFORM will > include ARCH_TEGRA anyway. I'm not sure why that patch hasn't made it > into linux-next yet, though. I saw the problem with ARCH_MULTIPLATFORM enabled, so I don't understand how adding the dependency above would help. A possible alternative would be to define an empty alternative for the interface used here, as the patch below. Arnd diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h index 642789b..1397190 100644 --- a/include/linux/clk/tegra.h +++ b/include/linux/clk/tegra.h @@ -120,8 +120,13 @@ static inline void tegra_cpu_clock_resume(void) } #endif +#ifdef ARCH_TEGRA void tegra_periph_reset_deassert(struct clk *c); void tegra_periph_reset_assert(struct clk *c); +#else +static inline void tegra_periph_reset_deassert(struct clk *c) {} +static inline void tegra_periph_reset_assert(struct clk *c) {} +#endif void tegra_clocks_init(void); void tegra_clocks_apply_init_table(void);