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

Commit f2d12b8e authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm/vmwgfx: Use fb handover mechanism instead of stealth mode. 



When the vmwgfx module is loaded on top of vesafb, it would operate in
stealth mode in parallel with vesafb, evicting VRAM on dropmaster.

Change that to use the vesafb handover mechanism, like other drmfb drivers.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 01d45039

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+16 −33
Original line number Diff line number Diff line
@@ -348,22 +348,19 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
		 */



		DRM_INFO("It appears like vesafb is loaded. "

			 "Ignore above error if any. Entering stealth mode.\n");

			 "Ignore above error if any.\n");

		ret = pci_request_region(dev->pdev, 2, "vmwgfx stealth probe");

		if (unlikely(ret != 0)) {

			DRM_ERROR("Failed reserving the SVGA MMIO resource.\n");

			goto out_no_device;

		}

		vmw_kms_init(dev_priv);

		vmw_overlay_init(dev_priv);

	} else {

	}

	ret = vmw_request_device(dev_priv);

	if (unlikely(ret != 0))

		goto out_no_device;

	vmw_kms_init(dev_priv);

	vmw_overlay_init(dev_priv);

	vmw_fb_init(dev_priv);

	}



	dev_priv->pm_nb.notifier_call = vmwgfx_pm_notifier;

	register_pm_notifier(&dev_priv->pm_nb);
@@ -406,17 +403,15 @@ static int vmw_driver_unload(struct drm_device *dev) 


	unregister_pm_notifier(&dev_priv->pm_nb);



	if (!dev_priv->stealth) {

	vmw_fb_close(dev_priv);

	vmw_kms_close(dev_priv);

	vmw_overlay_close(dev_priv);

	vmw_release_device(dev_priv);

		pci_release_regions(dev->pdev);

	} else {

		vmw_kms_close(dev_priv);

		vmw_overlay_close(dev_priv);

	if (dev_priv->stealth)

		pci_release_region(dev->pdev, 2);

	}

	else

		pci_release_regions(dev->pdev);



	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)

		drm_irq_uninstall(dev_priv->dev);

	if (dev->devname == vmw_devname)
@@ -585,11 +580,6 @@ static int vmw_master_set(struct drm_device *dev, 
	int ret = 0;



	DRM_INFO("Master set.\n");

	if (dev_priv->stealth) {

		ret = vmw_request_device(dev_priv);

		if (unlikely(ret != 0))

			return ret;

	}



	if (active) {

		BUG_ON(active != &dev_priv->fbdev_master);
@@ -649,17 +639,10 @@ static void vmw_master_drop(struct drm_device *dev, 


	ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);



	if (dev_priv->stealth) {

		ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);

		if (unlikely(ret != 0))

			DRM_ERROR("Unable to clean VRAM on master drop.\n");

		vmw_release_device(dev_priv);

	}

	dev_priv->active_master = &dev_priv->fbdev_master;

	ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM);

	ttm_vt_unlock(&dev_priv->fbdev_master.lock);



	if (!dev_priv->stealth)

	vmw_fb_on(dev_priv);

}

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+3 −0
Original line number Diff line number Diff line
@@ -559,6 +559,9 @@ int vmw_fb_init(struct vmw_private *vmw_priv) 
	info->pixmap.scan_align = 1;

#endif



	info->aperture_base = vmw_priv->vram_start;

	info->aperture_size = vmw_priv->vram_size;



	/*

	 * Dirty & Deferred IO

	 */