drm/ttm: Add a parameter to add extra pages into ttm_tt

Add a parameter called "extra_pages" for ttm_tt_init, to indicate that
driver needs extra pages in ttm_tt.

v2:
  Used imperative wording [Thomas and Christian]

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
cc: Christian Koenig <christian.koenig@amd.com>
cc: Hellstrom Thomas <thomas.hellstrom@intel.com>
Reviewed-by: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Reviewed-by: Christian Konig <christian.koenig@amd.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220401123751.27771-8-ramalingam.c@intel.com

diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index 3f00192215d11bb6a395a439151c8985517aacb7..eef1f4dc7232db4d8dd5dddb6d7920eb65040a8b 100644 (file)
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -864,7 +864,7 @@ static struct ttm_tt *bo_driver_ttm_tt_create(struct ttm_buffer_object *bo,
        if (!tt)
                return NULL;
 
-       ret = ttm_tt_init(tt, bo, page_flags, ttm_cached);
+       ret = ttm_tt_init(tt, bo, page_flags, ttm_cached, 0);
        if (ret < 0)
                goto err_ttm_tt_init;
 

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 6fc192082d8c84f13f3b0c7471f0dde04251eac4..1305624a0753b29d1069cb76456be345d7126df4 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -270,7 +270,7 @@ static struct ttm_tt *i915_ttm_tt_create(struct ttm_buffer_object *bo,
                i915_tt->is_shmem = true;
        }
 
-       ret = ttm_tt_init(&i915_tt->ttm, bo, page_flags, caching);
+       ret = ttm_tt_init(&i915_tt->ttm, bo, page_flags, caching, 0);
        if (ret)
                goto err_free;
 

diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 95df5750f47f918fd910d3fdc66bc99a9aea607a..9ba871bd19b1950b5e1a6264673d395fde6007a8 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -113,7 +113,7 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo,
        ttm = kzalloc(sizeof(struct ttm_tt), GFP_KERNEL);
        if (ttm == NULL)
                return NULL;
-       if (ttm_tt_init(ttm, bo, page_flags, ttm_cached)) {
+       if (ttm_tt_init(ttm, bo, page_flags, ttm_cached, 0)) {
                kfree(ttm);
                return NULL;
        }

diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c
index 6ddc16f0fe2b3432a9fc56706d414c4de5dd4eb2..d27691f2e451879f7866f148e81478225677f8c0 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c
@@ -134,7 +134,7 @@ struct ttm_tt *ttm_agp_tt_create(struct ttm_buffer_object *bo,
        agp_be->mem = NULL;
        agp_be->bridge = bridge;
 
-       if (ttm_tt_init(&agp_be->ttm, bo, page_flags, ttm_write_combined)) {
+       if (ttm_tt_init(&agp_be->ttm, bo, page_flags, ttm_write_combined, 0)) {
                kfree(agp_be);
                return NULL;
        }

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 79c870a3bef8d5399d000aca435b32d55ebd56bc..9cebbbd0bcaca987f04a8eb44fd72edb970d370c 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -134,9 +134,10 @@ void ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm)
 static void ttm_tt_init_fields(struct ttm_tt *ttm,
                               struct ttm_buffer_object *bo,
                               uint32_t page_flags,
-                              enum ttm_caching caching)
+                              enum ttm_caching caching,
+                              unsigned long extra_pages)
 {
-       ttm->num_pages = PAGE_ALIGN(bo->base.size) >> PAGE_SHIFT;
+       ttm->num_pages = (PAGE_ALIGN(bo->base.size) >> PAGE_SHIFT) + extra_pages;
        ttm->caching = ttm_cached;
        ttm->page_flags = page_flags;
        ttm->dma_address = NULL;
@@ -146,9 +147,10 @@ static void ttm_tt_init_fields(struct ttm_tt *ttm,
 }
 
 int ttm_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo,
-               uint32_t page_flags, enum ttm_caching caching)
+               uint32_t page_flags, enum ttm_caching caching,
+               unsigned long extra_pages)
 {
-       ttm_tt_init_fields(ttm, bo, page_flags, caching);
+       ttm_tt_init_fields(ttm, bo, page_flags, caching, extra_pages);
 
        if (ttm_tt_alloc_page_directory(ttm)) {
                pr_err("Failed allocating page table\n");
@@ -180,7 +182,7 @@ int ttm_sg_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo,
 {
        int ret;
 
-       ttm_tt_init_fields(ttm, bo, page_flags, caching);
+       ttm_tt_init_fields(ttm, bo, page_flags, caching, 0);
 
        if (page_flags & TTM_TT_FLAG_EXTERNAL)
                ret = ttm_sg_tt_alloc_page_directory(ttm);

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index b84ecc6d6611f25f1791efa2180f468632787fa0..4e3938e62c08b31fa349ad34b02cbb1c7d1388f3 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -517,7 +517,7 @@ static struct ttm_tt *vmw_ttm_tt_create(struct ttm_buffer_object *bo,
                                     ttm_cached);
        else
                ret = ttm_tt_init(&vmw_be->dma_ttm, bo, page_flags,
-                                 ttm_cached);
+                                 ttm_cached, 0);
        if (unlikely(ret != 0))
                goto out_no_init;
 

diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h
index f20832139815db256a4852dc62325eea9261e5ce..17a0310e8aaaf644ec3a9993e255bbf96290de30 100644 (file)
--- a/include/drm/ttm/ttm_tt.h
+++ b/include/drm/ttm/ttm_tt.h
@@ -140,6 +140,7 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc);
  * @bo: The buffer object we create the ttm for.
  * @page_flags: Page flags as identified by TTM_TT_FLAG_XX flags.
  * @caching: the desired caching state of the pages
+ * @extra_pages: Extra pages needed for the driver.
  *
  * Create a struct ttm_tt to back data with system memory pages.
  * No pages are actually allocated.
@@ -147,7 +148,8 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc);
  * NULL: Out of memory.
  */
 int ttm_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo,
-               uint32_t page_flags, enum ttm_caching caching);
+               uint32_t page_flags, enum ttm_caching caching,
+               unsigned long extra_pages);
 int ttm_sg_tt_init(struct ttm_tt *ttm_dma, struct ttm_buffer_object *bo,
                   uint32_t page_flags, enum ttm_caching caching);