Nouveau - Dec 2021 - [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")
Signed-off-by: Lu Baolu <baolu.lu at linux.intel.com>
---
 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
index d0d52c1d4aee..992cc285f2fe 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
@@ -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 {
-- 
2.25.1

On 2021-12-18 07:45, Lu Baolu wrote:
> 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,

Reviewed-by: Robin Murphy <robin.murphy at arm.com>
> Signed-off-by: Lu Baolu <baolu.lu at linux.intel.com>
> ---
>   drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
> index d0d52c1d4aee..992cc285f2fe 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
> @@ -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 {