Commit 840462e6 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/vmwgfx: Remove references to struct drm_device.pdev 



Using struct drm_device.pdev is deprecated. Convert vmwgfx to struct
drm_device.dev. No functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarZack Rusin <zackr@vmware.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Roland Scheidegger <sroland@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201201103542.2182-20-tzimmermann@suse.de
parent 5bbacc2e

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c

+4 −4
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ int vmw_cmdbuf_set_pool_size(struct vmw_cmdbuf_man *man, 


	/* First, try to allocate a huge chunk of DMA memory */

	size = PAGE_ALIGN(size);

	man->map = dma_alloc_coherent(&dev_priv->dev->pdev->dev, size,

	man->map = dma_alloc_coherent(dev_priv->dev->dev, size,

				      &man->handle, GFP_KERNEL);

	if (man->map) {

		man->using_mob = false;
@@ -1313,7 +1313,7 @@ struct vmw_cmdbuf_man *vmw_cmdbuf_man_create(struct vmw_private *dev_priv) 
	man->num_contexts = (dev_priv->capabilities & SVGA_CAP_HP_CMD_QUEUE) ?

		2 : 1;

	man->headers = dma_pool_create("vmwgfx cmdbuf",

				       &dev_priv->dev->pdev->dev,

				       dev_priv->dev->dev,

				       sizeof(SVGACBHeader),

				       64, PAGE_SIZE);

	if (!man->headers) {
@@ -1322,7 +1322,7 @@ struct vmw_cmdbuf_man *vmw_cmdbuf_man_create(struct vmw_private *dev_priv) 
	}



	man->dheaders = dma_pool_create("vmwgfx inline cmdbuf",

					&dev_priv->dev->pdev->dev,

					dev_priv->dev->dev,

					sizeof(struct vmw_cmdbuf_dheader),

					64, PAGE_SIZE);

	if (!man->dheaders) {
@@ -1387,7 +1387,7 @@ void vmw_cmdbuf_remove_pool(struct vmw_cmdbuf_man *man) 
		ttm_bo_put(man->cmd_space);

		man->cmd_space = NULL;

	} else {

		dma_free_coherent(&man->dev_priv->dev->pdev->dev,

		dma_free_coherent(man->dev_priv->dev->dev,

				  man->size, man->map, man->handle);

	}

}

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+14 −13
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
	enum vmw_res_type i;

	bool refuse_dma = false;

	char host_log[100] = {0};

	struct pci_dev *pdev = to_pci_dev(dev->dev);



	dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);

	if (unlikely(!dev_priv)) {
@@ -658,7 +659,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
		return -ENOMEM;

	}



	pci_set_master(dev->pdev);

	pci_set_master(pdev);



	dev_priv->dev = dev;

	dev_priv->vmw_chipset = chipset;
@@ -687,9 +688,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 


	dev_priv->used_memory_size = 0;



	dev_priv->io_start = pci_resource_start(dev->pdev, 0);

	dev_priv->vram_start = pci_resource_start(dev->pdev, 1);

	dev_priv->mmio_start = pci_resource_start(dev->pdev, 2);

	dev_priv->io_start = pci_resource_start(pdev, 0);

	dev_priv->vram_start = pci_resource_start(pdev, 1);

	dev_priv->mmio_start = pci_resource_start(pdev, 2);



	dev_priv->assume_16bpp = !!vmw_assume_16bpp;
@@ -839,7 +840,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 


	dev->dev_private = dev_priv;



	ret = pci_request_regions(dev->pdev, "vmwgfx probe");

	ret = pci_request_regions(pdev, "vmwgfx probe");

	dev_priv->stealth = (ret != 0);

	if (dev_priv->stealth) {

		/**
@@ -848,7 +849,7 @@ 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.\n");

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

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

		if (unlikely(ret != 0)) {

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

			goto out_no_device;
@@ -856,7 +857,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
	}



	if (dev_priv->capabilities & SVGA_CAP_IRQMASK) {

		ret = vmw_irq_install(dev, dev->pdev->irq);

		ret = vmw_irq_install(dev, pdev->irq);

		if (ret != 0) {

			DRM_ERROR("Failed installing irq: %d\n", ret);

			goto out_no_irq;
@@ -1002,9 +1003,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
		vmw_irq_uninstall(dev_priv->dev);

out_no_irq:

	if (dev_priv->stealth)

		pci_release_region(dev->pdev, 2);

		pci_release_region(pdev, 2);

	else

		pci_release_regions(dev->pdev);

		pci_release_regions(pdev);

out_no_device:

	ttm_object_device_release(&dev_priv->tdev);

out_err4:
@@ -1022,6 +1023,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
static void vmw_driver_unload(struct drm_device *dev)

{

	struct vmw_private *dev_priv = vmw_priv(dev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	enum vmw_res_type i;



	unregister_pm_notifier(&dev_priv->pm_nb);
@@ -1053,9 +1055,9 @@ static void vmw_driver_unload(struct drm_device *dev) 
	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)

		vmw_irq_uninstall(dev_priv->dev);

	if (dev_priv->stealth)

		pci_release_region(dev->pdev, 2);

		pci_release_region(pdev, 2);

	else

		pci_release_regions(dev->pdev);

		pci_release_regions(pdev);



	ttm_object_device_release(&dev_priv->tdev);

	memunmap(dev_priv->mmio_virt);
@@ -1519,7 +1521,6 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_pci_disable_device;

	}



	dev->pdev = pdev;

	pci_set_drvdata(pdev, dev);



	ret = vmw_driver_load(dev, ent->driver_data);

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static const struct fb_ops vmw_fb_ops = { 


int vmw_fb_init(struct vmw_private *vmw_priv)

{

	struct device *device = &vmw_priv->dev->pdev->dev;

	struct device *device = vmw_priv->dev->dev;

	struct vmw_fb_par *par;

	struct fb_info *info;

	unsigned fb_width, fb_height;