Skip to contentSkip to conversation

drm/nouveau/device: Get right pgsize_bitmap of iommu_domain

PATCH In review Lu Baolu 2 participants 2 messages Dec 18, 2021 – Dec 20, 2021

Subsystems (4)
lore
Share & tools
lore

Lu Baolu

author
#0 lore raw

PATCH 1/1 drm/nouveau/device: Get right pgsize_bitmap of iommu_domain

The suported page sizes of an iommu_domain are saved in the pgsize_bitmap field. Retrieve the value from the right place.

Fixes 58fd9375c2c534 ("drm/nouveau/platform: probe IOMMU if present")
---
 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +1 -1
index d0d52c1d4aee..992cc285f2fe 100644
@@ -133,7 +133,7 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev)
 		 * or equal to the system's PAGE_SIZE, with a preference if
 		 * both are equal.
 		 */
-		pgsize_bitmap = tdev->iommu.domain->ops->pgsize_bitmap;
+		pgsize_bitmap = tdev->iommu.domain->pgsize_bitmap;
 		if (pgsize_bitmap & PAGE_SIZE) {
 			tdev->iommu.pgshift = PAGE_SHIFT;
 		} else {
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Lu Baolu

The suported page sizes of an iommu_domain are saved in the pgsize_bitmap field. Retrieve the value from the right place.

Fixes 58fd9375c2c534 ("drm/nouveau/platform: probe IOMMU if present")

...except domain->pgsize_bitmap was introduced more than a year after that commit ;)

As an improvement rather than a fix, though,

Quoted 18 lines
---
  drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +1 -1
index d0d52c1d4aee..992cc285f2fe 100644
@@ -133,7 +133,7 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev)
  		 * or equal to the system's PAGE_SIZE, with a preference if
  		 * both are equal.
  		 */
-		pgsize_bitmap = tdev->iommu.domain->ops->pgsize_bitmap;
+		pgsize_bitmap = tdev->iommu.domain->pgsize_bitmap;
  		if (pgsize_bitmap & PAGE_SIZE) {
  			tdev->iommu.pgshift = PAGE_SHIFT;
  		} else {