nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

iommu: k5.9: remove archdata.iommu accesses

Browse Source 
k5.9 build needs below changes:
read archdata.iommu replaced by iommu_get_domain_for_dev
write archdata.iommu removed as alternative implementation used.

k5.9 build error fixed by explicit include of header <linux/iommu.h>

Change-Id: I464fd4144e4317b10aaa5460482f35e46527339a
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2400862
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Bitan Biswas
2020-08-19 06:14:52 -07:00
committed by Laxman Dewangan
parent 107b92c698
commit 0761c746f9
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/tegra/nvdec_t186.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 NVIDIA CORPORATION. All rights reserved.
* Copyright (C) 2016-2020 NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -25,7 +25,7 @@ static int nvdec_load_streamid_regs(struct tegra_drm_client *client)
struct nvdec *nvdec = to_nvdec(client);
int streamid = -EINVAL;
streamid = iommu_get_hwid(nvdec->dev->archdata.iommu, nvdec->dev, 0);
streamid = iommu_get_hwid(iommu_get_domain_for_dev(nvdec->dev), nvdec->dev, 0);
if (streamid >= 0) {
nvdec_writel(nvdec, streamid, NVDEC_THI_STREAMID0);

4
drivers/gpu/drm/tegra/nvenc_t186.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 NVIDIA CORPORATION. All rights reserved.
* Copyright (C) 2016-2020 NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -24,7 +24,7 @@ static int nvenc_load_streamid_regs(struct tegra_drm_client *client)
struct nvenc *nvenc = to_nvenc(client);
int streamid = -EINVAL;
streamid = iommu_get_hwid(nvenc->dev->archdata.iommu, nvenc->dev, 0);
streamid = iommu_get_hwid(iommu_get_domain_for_dev(nvenc->dev), nvenc->dev, 0);
if (streamid >= 0) {
nvenc_writel(nvenc, streamid, NVENC_THI_STREAMID0);

4
drivers/gpu/drm/tegra/nvjpg_t186.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 NVIDIA CORPORATION. All rights reserved.
* Copyright (C) 2016-2020 NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -24,7 +24,7 @@ static int nvjpg_load_streamid_regs(struct tegra_drm_client *client)
struct nvjpg *nvjpg = to_nvjpg(client);
int streamid = -EINVAL;
streamid = iommu_get_hwid(nvjpg->dev->archdata.iommu, nvjpg->dev, 0);
streamid = iommu_get_hwid(iommu_get_domain_for_dev(nvjpg->dev), nvjpg->dev, 0);
if (streamid >= 0) {
nvjpg_writel(nvjpg, streamid, NVJPG_THI_STREAMID0);

4
drivers/gpu/drm/tegra/tsec_t186.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 NVIDIA CORPORATION. All rights reserved.
* Copyright (C) 2016-2020 NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -24,7 +24,7 @@ static int tsec_load_streamid_regs(struct tegra_drm_client *client)
struct tsec *tsec = to_tsec(client);
int streamid = -EINVAL;
streamid = iommu_get_hwid(tsec->dev->archdata.iommu, tsec->dev, 0);
streamid = iommu_get_hwid(iommu_get_domain_for_dev(tsec->dev), tsec->dev, 0);
if (streamid >= 0) {
tsec_writel(tsec, streamid, TSEC_THI_STREAMID0);

4
drivers/gpu/drm/tegra/vic_t186.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 NVIDIA CORPORATION. All rights reserved.
* Copyright (C) 2016-2020 NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -24,7 +24,7 @@ static int vic_load_streamid_regs(struct tegra_drm_client *client)
struct vic *vic = to_vic(client);
int streamid = -EINVAL;
streamid = iommu_get_hwid(vic->dev->archdata.iommu, vic->dev, 0);
streamid = iommu_get_hwid(iommu_get_domain_for_dev(vic->dev), vic->dev, 0);
if (streamid >= 0) {
vic_writel(vic, streamid, VIC_THI_STREAMID0);