Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3458390b authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/vmwgfx: Reorder device takedown somewhat 



To take down the MOB and GMR memory types, the driver may have to issue
fence objects and thus make sure that the fence manager is taken down
after those memory types.
Reorder device init accordingly.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
parent 5151adb3

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+40 −37
Original line number Diff line number Diff line
@@ -725,32 +725,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
		goto out_err1;

	}



	ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_VRAM,

			     (dev_priv->vram_size >> PAGE_SHIFT));

	if (unlikely(ret != 0)) {

		DRM_ERROR("Failed initializing memory manager for VRAM.\n");

		goto out_err2;

	}



	dev_priv->has_gmr = 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) {

		DRM_INFO("No GMR memory available. "

			 "Graphics memory resources are very limited.\n");

		dev_priv->has_gmr = false;

	}



	if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS) {

		dev_priv->has_mob = true;

		if (ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_MOB,

				   VMW_PL_MOB) != 0) {

			DRM_INFO("No MOB memory available. "

				 "3D will be disabled.\n");

			dev_priv->has_mob = false;

		}

	}



	dev_priv->mmio_mtrr = arch_phys_wc_add(dev_priv->mmio_start,

					       dev_priv->mmio_size);
@@ -813,6 +787,33 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
		goto out_no_fman;

	}





	ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_VRAM,

			     (dev_priv->vram_size >> PAGE_SHIFT));

	if (unlikely(ret != 0)) {

		DRM_ERROR("Failed initializing memory manager for VRAM.\n");

		goto out_no_vram;

	}



	dev_priv->has_gmr = 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) {

		DRM_INFO("No GMR memory available. "

			 "Graphics memory resources are very limited.\n");

		dev_priv->has_gmr = false;

	}



	if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS) {

		dev_priv->has_mob = true;

		if (ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_MOB,

				   VMW_PL_MOB) != 0) {

			DRM_INFO("No MOB memory available. "

				 "3D will be disabled.\n");

			dev_priv->has_mob = false;

		}

	}



	vmw_kms_save_vga(dev_priv);



	/* Start kms and overlay systems, needs fifo. */
@@ -838,6 +839,12 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
	vmw_kms_close(dev_priv);

out_no_kms:

	vmw_kms_restore_vga(dev_priv);

	if (dev_priv->has_mob)

		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);

	if (dev_priv->has_gmr)

		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);

	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);

out_no_vram:

	vmw_fence_manager_takedown(dev_priv->fman);

out_no_fman:

	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)
@@ -853,12 +860,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
	iounmap(dev_priv->mmio_virt);

out_err3:

	arch_phys_wc_del(dev_priv->mmio_mtrr);

	if (dev_priv->has_mob)

		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);

	if (dev_priv->has_gmr)

		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);

	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);

out_err2:

	(void)ttm_bo_device_release(&dev_priv->bdev);

out_err1:

	vmw_ttm_global_release(dev_priv);
@@ -887,6 +888,13 @@ static int vmw_driver_unload(struct drm_device *dev) 
	}

	vmw_kms_close(dev_priv);

	vmw_overlay_close(dev_priv);



	if (dev_priv->has_mob)

		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);

	if (dev_priv->has_gmr)

		(void)ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);

	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);



	vmw_fence_manager_takedown(dev_priv->fman);

	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)

		drm_irq_uninstall(dev_priv->dev);
@@ -898,11 +906,6 @@ static int vmw_driver_unload(struct drm_device *dev) 
	ttm_object_device_release(&dev_priv->tdev);

	iounmap(dev_priv->mmio_virt);

	arch_phys_wc_del(dev_priv->mmio_mtrr);

	if (dev_priv->has_mob)

		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);

	if (dev_priv->has_gmr)

		(void)ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);

	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);

	(void)ttm_bo_device_release(&dev_priv->bdev);

	vmw_ttm_global_release(dev_priv);