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

Commit 52a05c30 authored by David Weinehall's avatar David Weinehall Committed by Chris Wilson
Browse files

drm/i915: pdev cleanup 



In an effort to simplify things for a future push of dev_priv instead
of dev wherever possible, always take pdev via dev_priv where
feasible, eliminating the direct access from dev. Right now this
only eliminates a few cases of dev, but it also obviates that we pass
dev into a lot of functions where dev_priv would be the more obvious
choice.

v2: Fixed one more place missing in the previous patch set

Signed-off-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160822103245.24069-5-david.weinehall@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 694c2828

drivers/gpu/drm/i915/i915_debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -2739,6 +2739,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused) 
	struct drm_info_node *node = m->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;



	if (!HAS_RUNTIME_PM(dev_priv))

		seq_puts(m, "Runtime power management not supported\n");
@@ -2753,8 +2754,8 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused) 
	seq_printf(m, "Device Power Management (CONFIG_PM) disabled\n");

#endif

	seq_printf(m, "PCI device power state: %s [%d]\n",

		   pci_power_name(dev_priv->drm.pdev->current_state),

		   dev_priv->drm.pdev->current_state);

		   pci_power_name(pdev->current_state),

		   pdev->current_state);



	return 0;

}

drivers/gpu/drm/i915/i915_drv.c

+34 −25
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static int i915_getparam(struct drm_device *dev, void *data, 
			 struct drm_file *file_priv)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	drm_i915_getparam_t *param = data;

	int value;
@@ -242,10 +243,10 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		/* Reject all old ums/dri params. */

		return -ENODEV;

	case I915_PARAM_CHIPSET_ID:

		value = dev->pdev->device;

		value = pdev->device;

		break;

	case I915_PARAM_REVISION:

		value = dev->pdev->revision;

		value = pdev->revision;

		break;

	case I915_PARAM_HAS_GEM:

		value = 1;
@@ -516,7 +517,7 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_ 
		pr_info("switched on\n");

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;

		/* i915 resume handler doesn't set to D0 */

		pci_set_power_state(dev->pdev, PCI_D0);

		pci_set_power_state(pdev, PCI_D0);

		i915_resume_switcheroo(dev);

		dev->switch_power_state = DRM_SWITCH_POWER_ON;

	} else {
@@ -585,6 +586,7 @@ static void i915_gem_fini(struct drm_device *dev) 
static int i915_load_modeset_init(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	int ret;



	if (i915_inject_load_failure())
@@ -601,13 +603,13 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	 * then we do not take part in VGA arbitration and the

	 * vga_client_register() fails with -ENODEV.

	 */

	ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);

	ret = vga_client_register(pdev, dev, NULL, i915_vga_set_decode);

	if (ret && ret != -ENODEV)

		goto out;



	intel_register_dsm_handler();



	ret = vga_switcheroo_register_client(dev->pdev, &i915_switcheroo_ops, false);

	ret = vga_switcheroo_register_client(pdev, &i915_switcheroo_ops, false);

	if (ret)

		goto cleanup_vga_client;
@@ -659,9 +661,9 @@ static int i915_load_modeset_init(struct drm_device *dev) 
cleanup_csr:

	intel_csr_ucode_fini(dev_priv);

	intel_power_domains_fini(dev_priv);

	vga_switcheroo_unregister_client(dev->pdev);

	vga_switcheroo_unregister_client(pdev);

cleanup_vga_client:

	vga_client_register(dev->pdev, NULL, NULL, NULL);

	vga_client_register(pdev, NULL, NULL, NULL);

out:

	return ret;

}
@@ -881,6 +883,7 @@ static void i915_driver_cleanup_early(struct drm_i915_private *dev_priv) 
static int i915_mmio_setup(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	int mmio_bar;

	int mmio_size;
@@ -897,7 +900,7 @@ static int i915_mmio_setup(struct drm_device *dev) 
		mmio_size = 512 * 1024;

	else

		mmio_size = 2 * 1024 * 1024;

	dev_priv->regs = pci_iomap(dev->pdev, mmio_bar, mmio_size);

	dev_priv->regs = pci_iomap(pdev, mmio_bar, mmio_size);

	if (dev_priv->regs == NULL) {

		DRM_ERROR("failed to map registers\n");
@@ -913,9 +916,10 @@ static int i915_mmio_setup(struct drm_device *dev) 
static void i915_mmio_cleanup(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;



	intel_teardown_mchbar(dev);

	pci_iounmap(dev->pdev, dev_priv->regs);

	pci_iounmap(pdev, dev_priv->regs);

}



/**
@@ -994,6 +998,7 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) 
 */

static int i915_driver_init_hw(struct drm_i915_private *dev_priv)

{

	struct pci_dev *pdev = dev_priv->drm.pdev;

	struct drm_device *dev = &dev_priv->drm;

	int ret;
@@ -1032,11 +1037,11 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
		goto out_ggtt;

	}



	pci_set_master(dev->pdev);

	pci_set_master(pdev);



	/* overlay on gen2 is broken and can't address above 1G */

	if (IS_GEN2(dev)) {

		ret = dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(30));

		ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(30));

		if (ret) {

			DRM_ERROR("failed to set DMA mask\n");
@@ -1053,7 +1058,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
	 * which also needs to be handled carefully.

	 */

	if (IS_BROADWATER(dev) || IS_CRESTLINE(dev)) {

		ret = dma_set_coherent_mask(&dev->pdev->dev, DMA_BIT_MASK(32));

		ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));



		if (ret) {

			DRM_ERROR("failed to set DMA mask\n");
@@ -1083,7 +1088,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
	 * stuck interrupts on some machines.

	 */

	if (!IS_I945G(dev) && !IS_I945GM(dev)) {

		if (pci_enable_msi(dev->pdev) < 0)

		if (pci_enable_msi(pdev) < 0)

			DRM_DEBUG_DRIVER("can't enable MSI");

	}
@@ -1101,10 +1106,10 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
 */

static void i915_driver_cleanup_hw(struct drm_i915_private *dev_priv)

{

	struct drm_device *dev = &dev_priv->drm;

	struct pci_dev *pdev = dev_priv->drm.pdev;



	if (dev->pdev->msi_enabled)

		pci_disable_msi(dev->pdev);

	if (pdev->msi_enabled)

		pci_disable_msi(pdev);



	pm_qos_remove_request(&dev_priv->pm_qos);

	i915_ggtt_cleanup_hw(dev_priv);
@@ -1274,6 +1279,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) 
void i915_driver_unload(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;



	intel_fbdev_fini(dev);
@@ -1302,8 +1308,8 @@ void i915_driver_unload(struct drm_device *dev) 
	kfree(dev_priv->vbt.lfp_lvds_vbt_mode);

	dev_priv->vbt.lfp_lvds_vbt_mode = NULL;



	vga_switcheroo_unregister_client(dev->pdev);

	vga_client_register(dev->pdev, NULL, NULL, NULL);

	vga_switcheroo_unregister_client(pdev);

	vga_client_register(pdev, NULL, NULL, NULL);



	intel_csr_ucode_fini(dev_priv);
@@ -1400,6 +1406,7 @@ static bool suspend_to_idle(struct drm_i915_private *dev_priv) 
static int i915_drm_suspend(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	pci_power_t opregion_target_state;

	int error;
@@ -1416,11 +1423,11 @@ static int i915_drm_suspend(struct drm_device *dev) 


	drm_kms_helper_poll_disable(dev);



	pci_save_state(dev->pdev);

	pci_save_state(pdev);



	error = i915_gem_suspend(dev);

	if (error) {

		dev_err(&dev->pdev->dev,

		dev_err(&pdev->dev,

			"GEM idle failed, resume might fail\n");

		goto out;

	}
@@ -1465,6 +1472,7 @@ static int i915_drm_suspend(struct drm_device *dev) 
static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	bool fw_csr;

	int ret;
@@ -1498,7 +1506,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) 
		goto out;

	}



	pci_disable_device(dev->pdev);

	pci_disable_device(pdev);

	/*

	 * During hibernation on some platforms the BIOS may try to access

	 * the device even though it's already in D3 and hang the machine. So
@@ -1512,7 +1520,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) 
	 * Acer Aspire 1830T

	 */

	if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6))

		pci_set_power_state(dev->pdev, PCI_D3hot);

		pci_set_power_state(pdev, PCI_D3hot);



	dev_priv->suspended_to_idle = suspend_to_idle(dev_priv);
@@ -1629,6 +1637,7 @@ static int i915_drm_resume(struct drm_device *dev) 
static int i915_drm_resume_early(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	int ret;



	/*
@@ -1651,7 +1660,7 @@ static int i915_drm_resume_early(struct drm_device *dev) 
	 * the device powered we can also remove the following set power state

	 * call.

	 */

	ret = pci_set_power_state(dev->pdev, PCI_D0);

	ret = pci_set_power_state(pdev, PCI_D0);

	if (ret) {

		DRM_ERROR("failed to set PCI D0 power state (%d)\n", ret);

		goto out;
@@ -1670,12 +1679,12 @@ static int i915_drm_resume_early(struct drm_device *dev) 
	 * depend on the device enable refcount we can't anyway depend on them

	 * disabling/enabling the device.

	 */

	if (pci_enable_device(dev->pdev)) {

	if (pci_enable_device(pdev)) {

		ret = -EIO;

		goto out;

	}



	pci_set_master(dev->pdev);

	pci_set_master(pdev);



	disable_rpm_wakeref_asserts(dev_priv);

drivers/gpu/drm/i915/i915_gem_gtt.c

+6 −4
Original line number Diff line number Diff line
@@ -350,10 +350,12 @@ static int setup_page_dma(struct drm_device *dev, struct i915_page_dma *p) 


static void cleanup_page_dma(struct drm_device *dev, struct i915_page_dma *p)

{

	struct pci_dev *pdev = dev->pdev;



	if (WARN_ON(!p->page))

		return;



	dma_unmap_page(&dev->pdev->dev, p->daddr, 4096, PCI_DMA_BIDIRECTIONAL);

	dma_unmap_page(&pdev->dev, p->daddr, 4096, PCI_DMA_BIDIRECTIONAL);

	__free_page(p->page);

	memset(p, 0, sizeof(*p));

}
@@ -2681,8 +2683,8 @@ static void ggtt_unbind_vma(struct i915_vma *vma) 


void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj)

{

	struct drm_device *dev = obj->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_private *dev_priv = to_i915(obj->base.dev);

	struct device *kdev = &dev_priv->drm.pdev->dev;

	struct i915_ggtt *ggtt = &dev_priv->ggtt;



	if (unlikely(ggtt->do_idle_maps)) {
@@ -2693,7 +2695,7 @@ void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj) 
		}

	}



	dma_unmap_sg(&dev->pdev->dev, obj->pages->sgl, obj->pages->nents,

	dma_unmap_sg(kdev, obj->pages->sgl, obj->pages->nents,

		     PCI_DMA_BIDIRECTIONAL);

}

drivers/gpu/drm/i915/i915_gem_stolen.c

+10 −9
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, 
static unsigned long i915_stolen_to_physical(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	struct i915_ggtt *ggtt = &dev_priv->ggtt;

	struct resource *r;

	u32 base;
@@ -111,7 +112,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
	if (INTEL_INFO(dev)->gen >= 3) {

		u32 bsm;



		pci_read_config_dword(dev->pdev, INTEL_BSM, &bsm);

		pci_read_config_dword(pdev, INTEL_BSM, &bsm);



		base = bsm & INTEL_BSM_MASK;

	} else if (IS_I865G(dev)) {
@@ -119,7 +120,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
		u16 toud = 0;

		u8 tmp;



		pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),

		pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),

					 I845_ESMRAMC, &tmp);



		if (tmp & TSEG_ENABLE) {
@@ -133,7 +134,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
			}

		}



		pci_bus_read_config_word(dev->pdev->bus, PCI_DEVFN(0, 0),

		pci_bus_read_config_word(pdev->bus, PCI_DEVFN(0, 0),

					 I865_TOUD, &toud);



		base = (toud << 16) + tseg_size;
@@ -142,13 +143,13 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
		u32 tom;

		u8 tmp;



		pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),

		pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),

					 I85X_ESMRAMC, &tmp);



		if (tmp & TSEG_ENABLE)

			tseg_size = MB(1);



		pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 1),

		pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 1),

					 I85X_DRB3, &tmp);

		tom = tmp * MB(32);
@@ -158,7 +159,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
		u32 tom;

		u8 tmp;



		pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),

		pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),

					 I845_ESMRAMC, &tmp);



		if (tmp & TSEG_ENABLE) {
@@ -172,7 +173,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
			}

		}



		pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),

		pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),

					 I830_DRB3, &tmp);

		tom = tmp * MB(32);
@@ -182,7 +183,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
		u32 tom;

		u8 tmp;



		pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),

		pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),

					 I830_ESMRAMC, &tmp);



		if (tmp & TSEG_ENABLE) {
@@ -192,7 +193,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
				tseg_size = KB(512);

		}



		pci_bus_read_config_byte(dev->pdev->bus, PCI_DEVFN(0, 0),

		pci_bus_read_config_byte(pdev->bus, PCI_DEVFN(0, 0),

					 I830_DRB3, &tmp);

		tom = tmp * MB(32);

drivers/gpu/drm/i915/i915_gpu_error.c

+5 −4
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, 
{

	struct drm_device *dev = error_priv->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct pci_dev *pdev = dev_priv->drm.pdev;

	struct drm_i915_error_state *error = error_priv->error;

	struct drm_i915_error_object *obj;

	int i, j, offset, elt;
@@ -367,11 +368,11 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, 
	}

	err_printf(m, "Reset count: %u\n", error->reset_count);

	err_printf(m, "Suspend count: %u\n", error->suspend_count);

	err_printf(m, "PCI ID: 0x%04x\n", dev->pdev->device);

	err_printf(m, "PCI Revision: 0x%02x\n", dev->pdev->revision);

	err_printf(m, "PCI ID: 0x%04x\n", pdev->device);

	err_printf(m, "PCI Revision: 0x%02x\n", pdev->revision);

	err_printf(m, "PCI Subsystem: %04x:%04x\n",

		   dev->pdev->subsystem_vendor,

		   dev->pdev->subsystem_device);

		   pdev->subsystem_vendor,

		   pdev->subsystem_device);

	err_printf(m, "IOMMU enabled?: %d\n", error->iommu);



	if (HAS_CSR(dev)) {