On Mon, Oct 20, 2025 at 7:54 AM Tvrtko Ursulin
<[email protected]> wrote:
>
> 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: Tvrtko Ursulin <[email protected]>
> Cc: Alex Deucher <[email protected]>
> Cc: Christian König <[email protected]>
> Cc: Danilo Krummrich <[email protected]>
> Cc: Dave Airlie <[email protected]>
> Cc: Gerd Hoffmann <[email protected]>
> Cc: Joonas Lahtinen <[email protected]>
> Cc: Lucas De Marchi <[email protected]>
> Cc: Lyude Paul <[email protected]>
> Cc: Maarten Lankhorst <[email protected]>
> Cc: Maxime Ripard <[email protected]>
> Cc: Rodrigo Vivi <[email protected]>
> Cc: Sui Jingfeng <[email protected]>
> Cc: Thomas Hellström <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: Zack Rusin <[email protected]>
> Acked-by: Christian König <[email protected]>
> ---
> v2:
>  * Rebase for rename and move of flags to alloc_flags / TTM_ALLOCATION_.
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c       |  6 +++--
>  drivers/gpu/drm/drm_gem_vram_helper.c         |  2 +-
>  drivers/gpu/drm/i915/intel_region_ttm.c       |  2 +-
>  drivers/gpu/drm/loongson/lsdc_ttm.c           |  3 ++-
>  drivers/gpu/drm/nouveau/nouveau_ttm.c         |  6 +++--
>  drivers/gpu/drm/qxl/qxl_ttm.c                 |  2 +-
>  drivers/gpu/drm/radeon/radeon_ttm.c           |  6 +++--
>  drivers/gpu/drm/ttm/tests/ttm_bo_test.c       | 16 +++++++-------
>  .../gpu/drm/ttm/tests/ttm_bo_validate_test.c  |  2 +-
>  drivers/gpu/drm/ttm/tests/ttm_device_test.c   | 12 +++++-----
>  drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 22 ++++++++-----------
>  drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h |  7 ++----
>  drivers/gpu/drm/ttm/ttm_device.c              |  9 +++-----
>  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           |  4 ++--
>  drivers/gpu/drm/xe/xe_device.c                |  2 +-
>  include/drm/ttm/ttm_device.h                  |  3 ++-
>  16 files changed, 50 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 8f6d331e1ea2..7b144ddea268 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -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);
> diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c 
> b/drivers/gpu/drm/drm_gem_vram_helper.c
> index 0bec6f66682b..dd3292e57d64 100644
> --- a/drivers/gpu/drm/drm_gem_vram_helper.c
> +++ b/drivers/gpu/drm/drm_gem_vram_helper.c
> @@ -859,7 +859,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;
>
> diff --git a/drivers/gpu/drm/i915/intel_region_ttm.c 
> b/drivers/gpu/drm/i915/intel_region_ttm.c
> index 04525d92bec5..47a69aad5c3f 100644
> --- a/drivers/gpu/drm/i915/intel_region_ttm.c
> +++ b/drivers/gpu/drm/i915/intel_region_ttm.c
> @@ -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);
>  }
>
>  /**
> diff --git a/drivers/gpu/drm/loongson/lsdc_ttm.c 
> b/drivers/gpu/drm/loongson/lsdc_ttm.c
> index 2e42c6970c9f..dca0d33e2cf2 100644
> --- a/drivers/gpu/drm/loongson/lsdc_ttm.c
> +++ b/drivers/gpu/drm/loongson/lsdc_ttm.c
> @@ -544,7 +544,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;
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c 
> b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index 7d2436e5d50d..47b20cf80388 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -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;
> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
> index 765a144cea14..85d9df48affa 100644
> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
> @@ -196,7 +196,7 @@ int qxl_ttm_init(struct qxl_device *qdev)
>         r = ttm_device_init(&qdev->mman.bdev, &qxl_bo_driver, NULL,
>                             qdev->ddev.anon_inode->i_mapping,
>                             qdev->ddev.vma_offset_manager,
> -                           false, false);
> +                           0);
>         if (r) {
>                 DRM_ERROR("failed initializing buffer object driver(%d).\n", 
> r);
>                 return r;
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c 
> b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 616d25c8c2de..51dffe23c0fc 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -683,8 +683,10 @@ int radeon_ttm_init(struct radeon_device *rdev)
>         r = ttm_device_init(&rdev->mman.bdev, &radeon_bo_driver, rdev->dev,
>                                rdev_to_drm(rdev)->anon_inode->i_mapping,
>                                rdev_to_drm(rdev)->vma_offset_manager,
> -                              rdev->need_swiotlb,
> -                              dma_addressing_limited(&rdev->pdev->dev));
> +                              (rdev->need_swiotlb ?
> +                               TTM_ALLOCATION_POOL_USE_DMA_ALLOC : 0 ) |
> +                              (dma_addressing_limited(&rdev->pdev->dev) ?
> +                               TTM_ALLOCATION_POOL_USE_DMA32 : 0));
>         if (r) {
>                 DRM_ERROR("failed initializing buffer object driver(%d).\n", 
> r);
>                 return r;
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_bo_test.c 
> b/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
> index 5426b435f702..d468f8322072 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
> @@ -251,7 +251,7 @@ static void ttm_bo_unreserve_basic(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> @@ -290,7 +290,7 @@ static void ttm_bo_unreserve_pinned(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> @@ -342,7 +342,7 @@ static void ttm_bo_unreserve_bulk(struct kunit *test)
>         resv = kunit_kzalloc(test, sizeof(*resv), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, resv);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> @@ -394,7 +394,7 @@ static void ttm_bo_fini_basic(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> @@ -437,7 +437,7 @@ static void ttm_bo_fini_shared_resv(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> @@ -477,7 +477,7 @@ static void ttm_bo_pin_basic(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> @@ -512,7 +512,7 @@ static void ttm_bo_pin_unpin_resource(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> @@ -563,7 +563,7 @@ static void ttm_bo_multiple_pin_one_unpin(struct kunit 
> *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>         priv->ttm_dev = ttm_dev;
>
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c 
> b/drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c
> index 3a1eef83190c..17a570af296c 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c
> @@ -995,7 +995,7 @@ static void ttm_bo_validate_busy_domain_evict(struct 
> kunit *test)
>          */
>         ttm_device_fini(priv->ttm_dev);
>
> -       err = ttm_device_kunit_init_bad_evict(test->priv, priv->ttm_dev, 
> false, false);
> +       err = ttm_device_kunit_init_bad_evict(test->priv, priv->ttm_dev);
>         KUNIT_ASSERT_EQ(test, err, 0);
>
>         ttm_mock_manager_init(priv->ttm_dev, mem_type, MANAGER_SIZE);
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_device_test.c 
> b/drivers/gpu/drm/ttm/tests/ttm_device_test.c
> index 98648d5f20e7..2d55ad34fe48 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_device_test.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_device_test.c
> @@ -25,7 +25,7 @@ static void ttm_device_init_basic(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>
>         KUNIT_EXPECT_PTR_EQ(test, ttm_dev->funcs, &ttm_dev_funcs);
> @@ -55,7 +55,7 @@ static void ttm_device_init_multiple(struct kunit *test)
>         KUNIT_ASSERT_NOT_NULL(test, ttm_devs);
>
>         for (i = 0; i < num_dev; i++) {
> -               err = ttm_device_kunit_init(priv, &ttm_devs[i], false, false);
> +               err = ttm_device_kunit_init(priv, &ttm_devs[i], 0);
>                 KUNIT_ASSERT_EQ(test, err, 0);
>
>                 KUNIT_EXPECT_PTR_EQ(test, ttm_devs[i].dev_mapping,
> @@ -81,7 +81,7 @@ static void ttm_device_fini_basic(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>
>         man = ttm_manager_type(ttm_dev, TTM_PL_SYSTEM);
> @@ -109,7 +109,7 @@ static void ttm_device_init_no_vma_man(struct kunit *test)
>         vma_man = drm->vma_offset_manager;
>         drm->vma_offset_manager = NULL;
>
> -       err = ttm_device_kunit_init(priv, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(priv, ttm_dev, 0);
>         KUNIT_EXPECT_EQ(test, err, -EINVAL);
>
>         /* Bring the manager back for a graceful cleanup */
> @@ -158,9 +158,7 @@ static void ttm_device_init_pools(struct kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(priv, ttm_dev,
> -                                   params->alloc_flags & 
> TTM_ALLOCATION_POOL_USE_DMA_ALLOC,
> -                                   params->alloc_flags & 
> TTM_ALLOCATION_POOL_USE_DMA32);
> +       err = ttm_device_kunit_init(priv, ttm_dev, params->alloc_flags);
>         KUNIT_ASSERT_EQ(test, err, 0);
>
>         pool = &ttm_dev->pool;
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c 
> b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
> index 7aaf0d1395ff..7b533e4e1e04 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
> @@ -117,8 +117,7 @@ static void bad_evict_flags(struct ttm_buffer_object *bo,
>
>  static int ttm_device_kunit_init_with_funcs(struct ttm_test_devices *priv,
>                                             struct ttm_device *ttm,
> -                                           bool use_dma_alloc,
> -                                           bool use_dma32,
> +                                           unsigned int alloc_flags,
>                                             struct ttm_device_funcs *funcs)
>  {
>         struct drm_device *drm = priv->drm;
> @@ -127,7 +126,7 @@ static int ttm_device_kunit_init_with_funcs(struct 
> ttm_test_devices *priv,
>         err = ttm_device_init(ttm, funcs, drm->dev,
>                               drm->anon_inode->i_mapping,
>                               drm->vma_offset_manager,
> -                             use_dma_alloc, use_dma32);
> +                             alloc_flags);
>
>         return err;
>  }
> @@ -143,11 +142,10 @@ EXPORT_SYMBOL_GPL(ttm_dev_funcs);
>
>  int ttm_device_kunit_init(struct ttm_test_devices *priv,
>                           struct ttm_device *ttm,
> -                         bool use_dma_alloc,
> -                         bool use_dma32)
> +                         unsigned int alloc_flags)
>  {
> -       return ttm_device_kunit_init_with_funcs(priv, ttm, use_dma_alloc,
> -                                               use_dma32, &ttm_dev_funcs);
> +       return ttm_device_kunit_init_with_funcs(priv, ttm, alloc_flags,
> +                                               &ttm_dev_funcs);
>  }
>  EXPORT_SYMBOL_GPL(ttm_device_kunit_init);
>
> @@ -161,12 +159,10 @@ struct ttm_device_funcs ttm_dev_funcs_bad_evict = {
>  EXPORT_SYMBOL_GPL(ttm_dev_funcs_bad_evict);
>
>  int ttm_device_kunit_init_bad_evict(struct ttm_test_devices *priv,
> -                                   struct ttm_device *ttm,
> -                                   bool use_dma_alloc,
> -                                   bool use_dma32)
> +                                   struct ttm_device *ttm)
>  {
> -       return ttm_device_kunit_init_with_funcs(priv, ttm, use_dma_alloc,
> -                                               use_dma32, 
> &ttm_dev_funcs_bad_evict);
> +       return ttm_device_kunit_init_with_funcs(priv, ttm, 0,
> +                                               &ttm_dev_funcs_bad_evict);
>  }
>  EXPORT_SYMBOL_GPL(ttm_device_kunit_init_bad_evict);
>
> @@ -252,7 +248,7 @@ struct ttm_test_devices *ttm_test_devices_all(struct 
> kunit *test)
>         ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
>         KUNIT_ASSERT_NOT_NULL(test, ttm_dev);
>
> -       err = ttm_device_kunit_init(devs, ttm_dev, false, false);
> +       err = ttm_device_kunit_init(devs, ttm_dev, 0);
>         KUNIT_ASSERT_EQ(test, err, 0);
>
>         devs->ttm_dev = ttm_dev;
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h 
> b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
> index c7da23232ffa..f8402b979d05 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
> +++ b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
> @@ -28,12 +28,9 @@ struct ttm_test_devices {
>  /* Building blocks for test-specific init functions */
>  int ttm_device_kunit_init(struct ttm_test_devices *priv,
>                           struct ttm_device *ttm,
> -                         bool use_dma_alloc,
> -                         bool use_dma32);
> +                         unsigned int alloc_flags);
>  int ttm_device_kunit_init_bad_evict(struct ttm_test_devices *priv,
> -                                   struct ttm_device *ttm,
> -                                   bool use_dma_alloc,
> -                                   bool use_dma32);
> +                                   struct ttm_device *ttm);
>  struct ttm_buffer_object *ttm_bo_kunit_init(struct kunit *test,
>                                             struct ttm_test_devices *devs,
>                                             size_t size,
> diff --git a/drivers/gpu/drm/ttm/ttm_device.c 
> b/drivers/gpu/drm/ttm/ttm_device.c
> index a97b1444536c..87c85ccb21ac 100644
> --- a/drivers/gpu/drm/ttm/ttm_device.c
> +++ b/drivers/gpu/drm/ttm/ttm_device.c
> @@ -199,8 +199,7 @@ EXPORT_SYMBOL(ttm_device_swapout);
>   * @dev: The core kernel device pointer for DMA mappings and allocations.
>   * @mapping: The address space to use for this bo.
>   * @vma_manager: A pointer to a vma manager.
> - * @use_dma_alloc: If coherent DMA allocation API should be used.
> - * @use_dma32: If we should use GFP_DMA32 for device memory allocations.
> + * @alloc_flags: TTM_ALLOCATION_ flags.
>   *
>   * Initializes a struct ttm_device:
>   * Returns:
> @@ -209,7 +208,7 @@ EXPORT_SYMBOL(ttm_device_swapout);
>  int ttm_device_init(struct ttm_device *bdev, const struct ttm_device_funcs 
> *funcs,
>                     struct device *dev, struct address_space *mapping,
>                     struct drm_vma_offset_manager *vma_manager,
> -                   bool use_dma_alloc, bool use_dma32)
> +                   unsigned int alloc_flags)
>  {
>         struct ttm_global *glob = &ttm_glob;
>         int ret, nid;
> @@ -237,9 +236,7 @@ int ttm_device_init(struct ttm_device *bdev, const struct 
> ttm_device_funcs *func
>         else
>                 nid = NUMA_NO_NODE;
>
> -       ttm_pool_init(&bdev->pool, dev, nid,
> -                     (use_dma_alloc ? TTM_ALLOCATION_POOL_USE_DMA_ALLOC : 0) 
> |
> -                     (use_dma32 ? TTM_ALLOCATION_POOL_USE_DMA32 : 0));
> +       ttm_pool_init(&bdev->pool, dev, nid, alloc_flags);
>
>         bdev->vma_manager = vma_manager;
>         spin_lock_init(&bdev->lru_lock);
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c 
> b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 8ff958d119be..599052d07ae8 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> @@ -1023,8 +1023,8 @@ static int vmw_driver_load(struct vmw_private 
> *dev_priv, u32 pci_id)
>                               dev_priv->drm.dev,
>                               dev_priv->drm.anon_inode->i_mapping,
>                               dev_priv->drm.vma_offset_manager,
> -                             dev_priv->map_mode == vmw_dma_alloc_coherent,
> -                             false);
> +                             (dev_priv->map_mode == vmw_dma_alloc_coherent) ?
> +                             TTM_ALLOCATION_POOL_USE_DMA_ALLOC : 0);
>         if (unlikely(ret != 0)) {
>                 drm_err(&dev_priv->drm,
>                         "Failed initializing TTM buffer object driver.\n");
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 5f6a412b571c..58e7996160a0 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -437,7 +437,7 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,
>
>         err = ttm_device_init(&xe->ttm, &xe_ttm_funcs, xe->drm.dev,
>                               xe->drm.anon_inode->i_mapping,
> -                             xe->drm.vma_offset_manager, false, false);
> +                             xe->drm.vma_offset_manager, 0);
>         if (WARN_ON(err))
>                 goto err;
>
> diff --git a/include/drm/ttm/ttm_device.h b/include/drm/ttm/ttm_device.h
> index 592b5f802859..074b98572275 100644
> --- a/include/drm/ttm/ttm_device.h
> +++ b/include/drm/ttm/ttm_device.h
> @@ -27,6 +27,7 @@
>
>  #include <linux/types.h>
>  #include <linux/workqueue.h>
> +#include <drm/ttm/ttm_allocation.h>
>  #include <drm/ttm/ttm_resource.h>
>  #include <drm/ttm/ttm_pool.h>
>
> @@ -292,7 +293,7 @@ static inline void ttm_set_driver_manager(struct 
> ttm_device *bdev, int type,
>  int ttm_device_init(struct ttm_device *bdev, const struct ttm_device_funcs 
> *funcs,
>                     struct device *dev, struct address_space *mapping,
>                     struct drm_vma_offset_manager *vma_manager,
> -                   bool use_dma_alloc, bool use_dma32);
> +                   unsigned int alloc_flags);
>  void ttm_device_fini(struct ttm_device *bdev);
>  void ttm_device_clear_dma_mappings(struct ttm_device *bdev);
>

Looks good. I'm always happy to see boolean's in function parameters
replaced by enums/defines.

Acked-by: Zack Rusin <[email protected]>

z

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

Reply via email to