diff --git a/drivers/gpu/drm/tegra/nvdec_t186.c b/drivers/gpu/drm/tegra/nvdec_t186.c
index 78d2235c..ca72c389 100644
--- a/drivers/gpu/drm/tegra/nvdec_t186.c
+++ b/drivers/gpu/drm/tegra/nvdec_t186.c
@@ -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);
diff --git a/drivers/gpu/drm/tegra/nvenc_t186.c b/drivers/gpu/drm/tegra/nvenc_t186.c
index 68cc6a7e..f544a553 100644
--- a/drivers/gpu/drm/tegra/nvenc_t186.c
+++ b/drivers/gpu/drm/tegra/nvenc_t186.c
@@ -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);
diff --git a/drivers/gpu/drm/tegra/nvjpg_t186.c b/drivers/gpu/drm/tegra/nvjpg_t186.c
index af262c58..8a7e8e41 100644
--- a/drivers/gpu/drm/tegra/nvjpg_t186.c
+++ b/drivers/gpu/drm/tegra/nvjpg_t186.c
@@ -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);
diff --git a/drivers/gpu/drm/tegra/tsec_t186.c b/drivers/gpu/drm/tegra/tsec_t186.c
index 5a47bbc2..a9772b12 100644
--- a/drivers/gpu/drm/tegra/tsec_t186.c
+++ b/drivers/gpu/drm/tegra/tsec_t186.c
@@ -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);
diff --git a/drivers/gpu/drm/tegra/vic_t186.c b/drivers/gpu/drm/tegra/vic_t186.c
index c6efe1e8..da887039 100644
--- a/drivers/gpu/drm/tegra/vic_t186.c
+++ b/drivers/gpu/drm/tegra/vic_t186.c
@@ -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);