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

Commit 552d6643 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-fixes-4.0' of git://people.freedesktop.org/~thomash/linux into drm-fixes 

A couple of fixes for vmwgfx.

* 'vmwgfx-fixes-4.0' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix an issue with the device losing its irq line on module unload
  drm/vmwgfx: Correctly NULLify dma buffer pointer on failure
  drm/vmwgfx: Reorder device takedown somewhat
  drm/vmwgfx: Fix a couple of lock dependency violations
parents 17b263f6 fd3e4d6e

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+41 −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 @@ out_no_fifo: 
	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 @@ out_err4: 
	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);
@@ -1235,6 +1238,7 @@ static void vmw_remove(struct pci_dev *pdev) 
{

	struct drm_device *dev = pci_get_drvdata(pdev);



	pci_disable_device(pdev);

	drm_put_dev(dev);

}

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+9 −9
Original line number Diff line number Diff line
@@ -890,7 +890,8 @@ static int vmw_translate_mob_ptr(struct vmw_private *dev_priv, 
	ret = vmw_user_dmabuf_lookup(sw_context->fp->tfile, handle, &vmw_bo);

	if (unlikely(ret != 0)) {

		DRM_ERROR("Could not find or use MOB buffer.\n");

		return -EINVAL;

		ret = -EINVAL;

		goto out_no_reloc;

	}

	bo = &vmw_bo->base;
@@ -914,7 +915,7 @@ static int vmw_translate_mob_ptr(struct vmw_private *dev_priv, 


out_no_reloc:

	vmw_dmabuf_unreference(&vmw_bo);

	vmw_bo_p = NULL;

	*vmw_bo_p = NULL;

	return ret;

}
@@ -951,7 +952,8 @@ static int vmw_translate_guest_ptr(struct vmw_private *dev_priv, 
	ret = vmw_user_dmabuf_lookup(sw_context->fp->tfile, handle, &vmw_bo);

	if (unlikely(ret != 0)) {

		DRM_ERROR("Could not find or use GMR region.\n");

		return -EINVAL;

		ret = -EINVAL;

		goto out_no_reloc;

	}

	bo = &vmw_bo->base;
@@ -974,7 +976,7 @@ static int vmw_translate_guest_ptr(struct vmw_private *dev_priv, 


out_no_reloc:

	vmw_dmabuf_unreference(&vmw_bo);

	vmw_bo_p = NULL;

	*vmw_bo_p = NULL;

	return ret;

}
@@ -2780,13 +2782,11 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, 
				  NULL, arg->command_size, arg->throttle_us,

				  (void __user *)(unsigned long)arg->fence_rep,

				  NULL);



	ttm_read_unlock(&dev_priv->reservation_sem);

	if (unlikely(ret != 0))

		goto out_unlock;

		return ret;



	vmw_kms_cursor_post_execbuf(dev_priv);



out_unlock:

	ttm_read_unlock(&dev_priv->reservation_sem);

	return ret;

	return 0;

}

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+3 −11
Original line number Diff line number Diff line
@@ -2033,23 +2033,17 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, 
	int i;

	struct drm_mode_config *mode_config = &dev->mode_config;



	ret = ttm_read_lock(&dev_priv->reservation_sem, true);

	if (unlikely(ret != 0))

		return ret;



	if (!arg->num_outputs) {

		struct drm_vmw_rect def_rect = {0, 0, 800, 600};

		vmw_du_update_layout(dev_priv, 1, &def_rect);

		goto out_unlock;

		return 0;

	}



	rects_size = arg->num_outputs * sizeof(struct drm_vmw_rect);

	rects = kcalloc(arg->num_outputs, sizeof(struct drm_vmw_rect),

			GFP_KERNEL);

	if (unlikely(!rects)) {

		ret = -ENOMEM;

		goto out_unlock;

	}

	if (unlikely(!rects))

		return -ENOMEM;



	user_rects = (void __user *)(unsigned long)arg->rects;

	ret = copy_from_user(rects, user_rects, rects_size);
@@ -2074,7 +2068,5 @@ int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, 


out_free:

	kfree(rects);

out_unlock:

	ttm_read_unlock(&dev_priv->reservation_sem);

	return ret;

}