From patchwork Mon Feb 18 11:00:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 10817861 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 40CC614E1 for ; Mon, 18 Feb 2019 12:17:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FE4C29F24 for ; Mon, 18 Feb 2019 12:17:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2457A2A0F2; Mon, 18 Feb 2019 12:17:55 +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 18BC429F24 for ; Mon, 18 Feb 2019 12:17:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7218B890C2; Mon, 18 Feb 2019 12:17:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D34689187 for ; Mon, 18 Feb 2019 11:00:55 +0000 (UTC) Received: by mail-lf1-x143.google.com with SMTP id g12so2345378lfb.13 for ; Mon, 18 Feb 2019 03:00:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=L+M4m7Q6d5WbVv4iV2+Qj1NKtADofA721rqptMpTGNQ=; b=U9jxOVWSeW0FclR2oLNKSfftWvZXddiqha7Kw2VHVSiEZEUYL/Gg3vyFwa7uM+pPll Y84A4PITPFPxbQEkJfDqmByx3DR90lgHzVraSiTE2DWk3NMJ8QCz1Gk0TT0ZSNVxZNv7 068PJmVD2sfp9PQjFw0xWO916hINK6TD54TO17mMLKISQQdczlB1/Q6NJv7B5DXi0Ju8 QCt99pfrBqW6xKSMhucjkbA78JUX+BjvfSqau/58uyvYMhs389lmrXsrLkQao15JYTQC hTQEZJrF753+gJSgBHaU7jVBPpb74pKXKcJBmp+hs01S1emjyfGFbVBbcXw0z/DSPF0W hAlQ== X-Gm-Message-State: AHQUAuaKGTPkBuytEG37pqgi7on0qUL7RlVxII04HZyVOXqLtayuzdVb sccjsaAHmFXaAXGqcuSwR0lxKw== X-Google-Smtp-Source: AHgI3IblLlacuMY+bbPqHXuI6+sd3yadtSubaZf3OsfiMP+FldozVW+norsopfqCFX3dUS1tlUuRuw== X-Received: by 2002:ac2:555d:: with SMTP id l29mr13280152lfk.38.1550487653418; Mon, 18 Feb 2019 03:00:53 -0800 (PST) Received: from localhost (c-573670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.87]) by smtp.gmail.com with ESMTPSA id y30sm3321340ljd.12.2019.02.18.03.00.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Feb 2019 03:00:52 -0800 (PST) From: Anders Roxell To: thierry.reding@gmail.com, airlied@linux.ie, daniel@ffwll.ch, jonathanh@nvidia.com Subject: [PATCH] drm/tegra: vic: fix implicit function declaration warning Date: Mon, 18 Feb 2019 12:00:50 +0100 Message-Id: <20190218110050.10589-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 18 Feb 2019 12:17:46 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=L+M4m7Q6d5WbVv4iV2+Qj1NKtADofA721rqptMpTGNQ=; b=w4ePGW2E2n+/9kZlF29uJmnec2v+5sC5znzIhsgTBJBsQGwPYv6QgmfwOxK5R+kIs+ DK+tfZ6IaMOPFsGYSLF+BfBVPL2Ur8vQfENrcgWCia/hnvtGXGAsQ2yTt2B67EQaoG3/ d4nPwkAwhCqD/wVbTVXmzhn4VZ7ut5WV8DTSztlLiByjI5oxUhNzItYBLqM77PSjcnQ6 +MB6hNq+s4ylEk7T6tOFTZMeTZ19Bdn6Q8DS36dACr6VKZa4cmZwTjfrQo7ZV+Qlk5S2 4LX3uAWPQ8ubCJKYjkhKNtNdwo9f7tSEjllWxWLHhG30shby/e9QXPRCC5f6bDm7EOQE /J1A== 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, Anders Roxell , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_IOMMU_API isn't set the following warnings pops up: drivers/gpu/drm/tegra/vic.c: In function ‘vic_boot’: drivers/gpu/drm/tegra/vic.c:110:31: 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(vic->dev); ^~~~~~~~~~~~~~~~~~~~ iommu_fwspec_free drivers/gpu/drm/tegra/vic.c:110:31: warning: initialization of ‘struct iommu_fwspec *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] drivers/gpu/drm/tegra/vic.c:117:19: error: ‘struct iommu_fwspec’ has no member named ‘num_ids’ if (spec && spec->num_ids > 0) { ^~ drivers/gpu/drm/tegra/vic.c:118:16: error: ‘struct iommu_fwspec’ has no member named ‘ids’ value = spec->ids[0] & 0xffff; ^~ Rework so that its inside a '#ifdef CONFIG_IOMMU_API' block. Fixes: f3779cb190a5 ("drm/tegra: vic: Support stream ID register programming") Signed-off-by: Anders Roxell --- drivers/gpu/drm/tegra/vic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 39bfed9623de..982ce37ecde1 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -106,6 +106,7 @@ static int vic_boot(struct vic *vic) if (vic->booted) return 0; +#ifdef CONFIG_IOMMU_API if (vic->config->supports_sid) { struct iommu_fwspec *spec = dev_iommu_fwspec_get(vic->dev); u32 value; @@ -121,6 +122,7 @@ static int vic_boot(struct vic *vic) vic_writel(vic, value, VIC_THI_STREAMID1); } } +#endif /* setup clockgating registers */ vic_writel(vic, CG_IDLE_CG_DLY_CNT(4) |