From patchwork Mon Mar 4 19:53:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10838479 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 902C61803 for ; Mon, 4 Mar 2019 19:59:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D0BA2AB25 for ; Mon, 4 Mar 2019 19:59:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FDB92AB2A; Mon, 4 Mar 2019 19:59:00 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 2A3812AB25 for ; Mon, 4 Mar 2019 19:59:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 404E789CD5; Mon, 4 Mar 2019 19:58:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 309 seconds by postgrey-1.36 at gabe; Mon, 04 Mar 2019 19:58:56 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id E4E1A89CD5 for ; Mon, 4 Mar 2019 19:58:56 +0000 (UTC) Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1N6KpF-1h2oYs00Of-016h1f; Mon, 04 Mar 2019 20:53:39 +0100 From: Arnd Bergmann To: Thierry Reding , Dmitry Osipenko Subject: [PATCH] gpu: host1x: avoid IOMMU_API build error Date: Mon, 4 Mar 2019 20:53:22 +0100 Message-Id: <20190304195338.989221-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:oJUIXwXXVRrNcZ0kfEQNr6srNfv8IKetG4QTMtLzlt63gs4q1Oz /MTDdlCEO9GlOTB4MKRMEVRLc/fHfCJJINX4qB9vKd9g/7t7inI+b/Ql7TJM+njQQ0qbVQs j5bQ6dZo8YOsdAyCI4tsOP2qUb9f9cVG2GD5f0ZKXoIeSV08w4SrifN3MW+JFfIVoEIFtom SF3Hr/+14xWCnj0mMGVdw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Jgr55x+4eNo=:JaNccVm5nwHGc69pYkvA5S MeKJrF4gMQ6In6UWPT3uoIUzRExMRlelLqpvBZF/auJuz9Q0HvZWLvhUn8qCajfonr6mWErJ+ IdKLOh6zaLegyMGKUEdbODdF6mF9Ri7q5ah4+HOz4ve+aPTF9+cL67vv+zsS/gFwh8weTU1Dn WVwoicQTWIAIsBKykaIYSyMjOYzhE5enkU+IKqECzogSg98J1CRSaPVHTNIivdJqE6+RXQjxb wWh+NE8EVPQMc5KXcVoK5FkyqmYhUi+t1z4yrpw5AFZ7qlAgm3RXmERE1MGgfJhEEiV1Vt3VB TvTM1uQWA+5UM1ZFXy6GmNd4i9u3sSuVzrCH724uP1hA6VZ0Ua28egeSYY/64lQuts5Z0s3Fn WAKYTFqRFqOb3XahZQVcXyOT7tyJVzC4J1gxooH1TZz48NaBGbqDF6osCUJXgDOFNVBF0riwH 0sqLu5qP9QosmPCecz6rsuPZn3nDoCDu1YKD3dYJ7gPTjTwGajcsOvU/v6nd1kq19sWOHMvEc pjJW6edAcAByihRV2/vXXHNrU0HJ1MZCaiipkPXKulitF1XqRSXNeX0XqDKJmyun+sPKyy2Vz /0q8gJ6l2dpZ/lO3nPelG+umi/PJ8jOj6GgsNzDocWMGXjS+dutOjkKnAGh3EaberwN4eQ6Rj lLDunrvphjiJSJN6Bv4gyynGz2IDRYQKZ91WyKwqIS2jL4wMl2FcwpKYvhWpGkWyqQM0CS5nG GBezr00WhuCGegytgRRim4NJUQAXomvFdjAVOwXVlaJAoDrrRy6BCFfTJPnnPC+QzSDfA68/O MKP2M85uKBnGuPW42kplohfU98ekqVFBqxIEvRu2WvFqISayBSxFl5At3pYXHzdQfjQulCl2g Z30R/mkQ/WCogpRMEfnOxkgflDOXyo3/blvk8e1lqBgWZp13EOWUEvxIDgO9VxDxtQ1EJETP+ 1+J1VRpUoHQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Arnd Bergmann , Mikko Perttunen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drivers/gpu/host1x/hw/channel_hw.c: In function 'host1x_channel_set_streamid': drivers/gpu/host1x/hw/channel_hw.c:118:30: error: implicit declaration of function 'dev_iommu_fwspec_get'; did you mean 'iommu_fwspec_free'? [-Werror=implicit-function-declaration] struct iommu_fwspec *spec = dev_iommu_fwspec_get(channel->dev->parent); ^~~~~~~~~~~~~~~~~~~~ iommu_fwspec_free drivers/gpu/host1x/hw/channel_hw.c:118:30: error: initialization of 'struct iommu_fwspec *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] drivers/gpu/host1x/hw/channel_hw.c:119:23: error: 'struct iommu_fwspec' has no member named 'ids' u32 sid = spec ? spec->ids[0] & 0xffff : 0x7f; ^~ cc1: all warnings being treated as errors Fixes: de5469c21ff9 ("gpu: host1x: Program the channel stream ID") Signed-off-by: Arnd Bergmann --- drivers/gpu/host1x/hw/channel_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index 27101c04a827..738dccf4ee3f 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c @@ -114,7 +114,7 @@ static inline void synchronize_syncpt_base(struct host1x_job *job) static void host1x_channel_set_streamid(struct host1x_channel *channel) { -#if HOST1X_HW >= 6 +#if HOST1X_HW >= 6 && defined(CONFIG_IOMMU_API) struct iommu_fwspec *spec = dev_iommu_fwspec_get(channel->dev->parent); u32 sid = spec ? spec->ids[0] & 0xffff : 0x7f;