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: 159580 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4149157jad; Mon, 4 Mar 2019 11:53:51 -0800 (PST) X-Google-Smtp-Source: APXvYqx9/RCD6wWLbRniYoirWdo3dlfj+qD4YT5Uana0MSoylRlJXketCWupSfpKcK9fGc6E/ZMt X-Received: by 2002:a63:2a89:: with SMTP id q131mr20068274pgq.193.1551729231565; Mon, 04 Mar 2019 11:53:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551729231; cv=none; d=google.com; s=arc-20160816; b=jXr7ycPs/VK/HyhD2/Y0txGjBZ+c2l1Z+mBYSv6yxaXAt5YzcgrEP/FHMGQxYEcRoU CEmuL6d+zf9IaIobbMhme7kCTVcYfMEzAzmgyp2URN49wZTu36hwN1pz35B4knKcPJ0A QpWMl1rjnajP38e1x2OXuPAi0MyEhDy9q3eXyWQaNlQrBPEjB4kFAknBCwkTIKPL8eI/ 9HLw0SLWb1HKcVEXu6sXhVxYrS4J4vN34DBWHGq5uLE6DA4lbvkAI/MCXtW9a+LfWli/ OShVHlP4kyZ/+N/Eeu4qkE01Vw6AHtSebYCwVXRKKKIRptdnSk53KmRXI1n8V4WCdDrF epsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=R+JK1C5GjrNO4jZhDP/TsN5R4ignf4ZR5jxjJGfCbLc=; b=ybk4Fay/qeNBX9LfntaIw1RWl4Yrv6Lshr2lBowdZ4T8cyLmVA1e0HuYd4mlGrN65G JhFzIoLlha+Vqw82xS4on2QqBZkK7LxNCNeobnnlGGBrgOsB9Mq/Bn+xwE3u/hvkYod6 DozLLrG/kqNZI8SBbJX6jMHXq0/uy6T6LkABRNyxXzRUyA+LCT6nJAzciZ9LqXoN+iNN oJMRjkkAvCJDopSximSbXRScuZ1OQd1bTgrdV/GsR9Ep+DDeStbsHP+nkE5dqoGvDqRx JrKfFeYMxEHAck/JtWJjMfWAKp7Cvzua2Eh0H2YPzt0g9O2pYjaYxo7F6iNsVMBQRBrp u9Bg== 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 k1si5982131pgg.215.2019.03.04.11.53.51; Mon, 04 Mar 2019 11:53:51 -0800 (PST) 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 S1726332AbfCDTxt (ORCPT + 31 others); Mon, 4 Mar 2019 14:53:49 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:34395 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726061AbfCDTxt (ORCPT ); Mon, 4 Mar 2019 14:53:49 -0500 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 Cc: Arnd Bergmann , Mikko Perttunen , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org 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-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:nq66aRj+TPw=:5OAuxVOGv6qi8hT0zIJcdk 5Ddd5n0RoOatWol1UbtA4SFuAmY75ECHP4pfaLJVmQxlOQXY7DIWqB+MQenR31Ny0B9NacTSa dFQrDREXhmPCFmd+o4QweyIm8EKmdHNW2jwBX0TSqrL8PYBQqG2k9T30LXm7qYJ4+8EwMrS/7 anyU4qddN3w71s+xRFhF1KKKLlcYoEXa52p+Jc8qwnT+qy4nl8LPkaswqWATP5beqRjpJH8kJ Y8PyHFgbr8OBXHMwwL43fQ0uX8mnZRe/+poCz/RvuGKBvyPE0hdRZKwMosHd/OSPza34ZCIN2 aVUlcZ/dcWIUQIGiPIFdq49dI3NpEPhWxJbWjwPHePax6AnL1HKZ5te4SR/LkF3bjE7S8iISE 8x0cgI2KJE9dcjaxMg/gCbNivBSfl8rIFXi7tX9XIkoQBIcGkm4PUmuteo4jGioMou/VXKN6i asW39XeZejdd6z9PwjHgCoRWZO9fzoNaWhWx/tnNHGWvHSORCL7YvN3FW6yRZdbXsNRSY9SYV 7z6iq/xP8z/zyJMl9gmXVtJqMsrwNTHVvlwmSU7XREbfUZrnHxXXBz+rGqSR33gUkjm2yOhMU rSnnInwGlH7HSlPHevpWGmqMH+TEOGdzgcfsL6lT2dMnWD+S5fjzp9+dB+9RYceUOPf8goR3l AlTETqqcEqc4Ooqp99K2xzUt1vanMMbpAlpyra08UylLs4xPv/Dq464+hJPRIrzXw27x4AJu9 lLtladVVI2xpDaIDqXv3frtXa1x3ql6XkVkZQQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.20.0 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;