Commit 77e19f8d authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Tvrtko Ursulin
Browse files

drm/ttm: Replace multiple booleans with flags in device init 



Multiple consecutive boolean function arguments are usually not very
readable.

Replace the ones in ttm_device_init() with flags with the additional
benefit of soon being able to pass in more data with just a one off
code base churning cost.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Sui Jingfeng <suijingfeng@loongson.cn>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Zack Rusin <zack.rusin@broadcom.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarZack Rusin <zack.rusin@broadcom.com>
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> # For xe
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarTvrtko Ursulin <tursulin@ursulin.net>
Link: https://lore.kernel.org/r/20251020115411.36818-4-tvrtko.ursulin@igalia.com
[tursulin: fixup checkpatch while applying]
parent 0af5b6a8

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+4 −2
Original line number Diff line number Diff line
@@ -1930,8 +1930,10 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	r = ttm_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->dev,

			       adev_to_drm(adev)->anon_inode->i_mapping,

			       adev_to_drm(adev)->vma_offset_manager,

			       adev->need_swiotlb,

			       dma_addressing_limited(adev->dev));

			       (adev->need_swiotlb ?

				TTM_ALLOCATION_POOL_USE_DMA_ALLOC : 0) |

			       (dma_addressing_limited(adev->dev) ?

				TTM_ALLOCATION_POOL_USE_DMA32 : 0));

	if (r) {

		dev_err(adev->dev,

			"failed initializing buffer object driver(%d).\n", r);

drivers/gpu/drm/drm_gem_vram_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev, 
	ret = ttm_device_init(&vmm->bdev, &bo_driver, dev->dev,

				 dev->anon_inode->i_mapping,

				 dev->vma_offset_manager,

				 false, true);

				 TTM_ALLOCATION_POOL_USE_DMA32);

	if (ret)

		return ret;

drivers/gpu/drm/i915/intel_region_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int intel_region_ttm_device_init(struct drm_i915_private *dev_priv) 


	return ttm_device_init(&dev_priv->bdev, i915_ttm_driver(),

			       drm->dev, drm->anon_inode->i_mapping,

			       drm->vma_offset_manager, false, false);

			       drm->vma_offset_manager, 0);

}



/**

drivers/gpu/drm/loongson/lsdc_ttm.c

+2 −1
Original line number Diff line number Diff line
@@ -545,7 +545,8 @@ int lsdc_ttm_init(struct lsdc_device *ldev) 


	ret = ttm_device_init(&ldev->bdev, &lsdc_bo_driver, ddev->dev,

			      ddev->anon_inode->i_mapping,

			      ddev->vma_offset_manager, false, true);

			      ddev->vma_offset_manager,

			      TTM_ALLOCATION_POOL_USE_DMA32);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_ttm.c

+4 −2
Original line number Diff line number Diff line
@@ -302,8 +302,10 @@ nouveau_ttm_init(struct nouveau_drm *drm) 
	ret = ttm_device_init(&drm->ttm.bdev, &nouveau_bo_driver, drm->dev->dev,

				  dev->anon_inode->i_mapping,

				  dev->vma_offset_manager,

				  drm_need_swiotlb(drm->client.mmu.dmabits),

				  drm->client.mmu.dmabits <= 32);

				  (drm_need_swiotlb(drm->client.mmu.dmabits) ?

				   TTM_ALLOCATION_POOL_USE_DMA_ALLOC : 0) |

				  (drm->client.mmu.dmabits <= 32 ?

				   TTM_ALLOCATION_POOL_USE_DMA32 : 0));

	if (ret) {

		NV_ERROR(drm, "error initialising bo driver, %d\n", ret);

		return ret;