drm/vmwgfx: stop implementing init_mem_type v2

Instead just initialize the memory type parameters
before calling ttm_bo_init_mm.

v2: keep extra system domain handling

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/382082/

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 47042838787843188667db503fa7d8815f373a93..8e67a29471a8c3261df4378acc5eeb5e60e30225 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -859,11 +859,16 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
                DRM_ERROR("Failed initializing TTM buffer object driver.\n");
                goto out_no_bdev;
        }
+       dev_priv->bdev.man[TTM_PL_SYSTEM].available_caching =
+               TTM_PL_FLAG_CACHED;
 
        /*
         * Enable VRAM, but initially don't use it until SVGA is enabled and
         * unhidden.
         */
+       dev_priv->bdev.man[TTM_PL_VRAM].func = &vmw_thp_func;
+       dev_priv->bdev.man[TTM_PL_VRAM].available_caching = TTM_PL_FLAG_CACHED;
+       dev_priv->bdev.man[TTM_PL_VRAM].default_caching = TTM_PL_FLAG_CACHED;
        ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_VRAM,
                             (dev_priv->vram_size >> PAGE_SHIFT));
        if (unlikely(ret != 0)) {
@@ -872,7 +877,17 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
        }
        dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
 
+       /*
+        * "Guest Memory Regions" is an aperture like feature with
+        *  one slot per bo. There is an upper limit of the number of
+        *  slots as well as the bo size.
+        */
        dev_priv->has_gmr = true;
+       dev_priv->bdev.man[VMW_PL_GMR].func = &vmw_gmrid_manager_func;
+       dev_priv->bdev.man[VMW_PL_GMR].available_caching = TTM_PL_FLAG_CACHED;
+       dev_priv->bdev.man[VMW_PL_GMR].default_caching = TTM_PL_FLAG_CACHED;
+       /* TODO: This is most likely not correct */
+       dev_priv->bdev.man[VMW_PL_GMR].use_tt = true;
        if (((dev_priv->capabilities & (SVGA_CAP_GMR | SVGA_CAP_GMR2)) == 0) ||
            refuse_dma || ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_GMR,
                                         VMW_PL_GMR) != 0) {
@@ -883,6 +898,11 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 
        if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS && !refuse_dma) {
                dev_priv->has_mob = true;
+               dev_priv->bdev.man[VMW_PL_MOB].func = &vmw_gmrid_manager_func;
+               dev_priv->bdev.man[VMW_PL_MOB].available_caching = TTM_PL_FLAG_CACHED;
+               dev_priv->bdev.man[VMW_PL_MOB].default_caching = TTM_PL_FLAG_CACHED;
+               /* TODO: This is most likely not correct */
+               dev_priv->bdev.man[VMW_PL_MOB].use_tt = true;
                if (ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_MOB,
                                   VMW_PL_MOB) != 0) {
                        DRM_INFO("No MOB memory available. "

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
index d00748ecaf202336d572bc30d826959d524655de..db4b2e2e4edb14f9726066b5aa7625e87bcafed0 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
@@ -739,34 +739,6 @@ out_no_init:
 static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
                      struct ttm_mem_type_manager *man)
 {
-       switch (type) {
-       case TTM_PL_SYSTEM:
-               /* System memory */
-               man->available_caching = TTM_PL_FLAG_CACHED;
-               break;
-       case TTM_PL_VRAM:
-               /* "On-card" video ram */
-               man->func = &vmw_thp_func;
-               man->available_caching = TTM_PL_FLAG_CACHED;
-               man->default_caching = TTM_PL_FLAG_CACHED;
-               break;
-       case VMW_PL_GMR:
-       case VMW_PL_MOB:
-               /*
-                * "Guest Memory Regions" is an aperture like feature with
-                *  one slot per bo. There is an upper limit of the number of
-                *  slots as well as the bo size.
-                */
-               man->func = &vmw_gmrid_manager_func;
-               man->available_caching = TTM_PL_FLAG_CACHED;
-               man->default_caching = TTM_PL_FLAG_CACHED;
-               /* TODO: This is most likely not correct */
-               man->use_tt = true;
-               break;
-       default:
-               DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);
-               return -EINVAL;
-       }
        return 0;
 }