Commit 6de8eee1 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug-vga' into for-linus 

* pci/hotplug-vga:
  ACPIPHP / radeon / nouveau: Remove acpi_bus_no_hotplug()
  PCI: Add pci_ignore_hotplug() to ignore hotplug events for a device
parents fd7155fc f91ce35e

drivers/acpi/bus.c

+0 −10
Original line number Diff line number Diff line
@@ -177,16 +177,6 @@ void acpi_bus_detach_private_data(acpi_handle handle) 
}

EXPORT_SYMBOL_GPL(acpi_bus_detach_private_data);



void acpi_bus_no_hotplug(acpi_handle handle)

{

	struct acpi_device *adev = NULL;



	acpi_bus_get_device(handle, &adev);

	if (adev)

		adev->flags.no_hotplug = true;

}

EXPORT_SYMBOL_GPL(acpi_bus_no_hotplug);



static void acpi_print_osc_error(acpi_handle handle,

	struct acpi_osc_context *context, char *error)

{

drivers/gpu/drm/nouveau/nouveau_acpi.c

+2 −14
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static struct nouveau_dsm_priv { 
	bool dsm_detected;

	bool optimus_detected;

	acpi_handle dhandle;

	acpi_handle other_handle;

	acpi_handle rom_handle;

} nouveau_dsm_priv;
@@ -222,10 +221,9 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev) 
	if (!dhandle)

		return false;



	if (!acpi_has_method(dhandle, "_DSM")) {

		nouveau_dsm_priv.other_handle = dhandle;

	if (!acpi_has_method(dhandle, "_DSM"))

		return false;

	}



	if (acpi_check_dsm(dhandle, nouveau_dsm_muid, 0x00000102,

			   1 << NOUVEAU_DSM_POWER))

		retval |= NOUVEAU_DSM_HAS_MUX;
@@ -301,16 +299,6 @@ static bool nouveau_dsm_detect(void) 
		printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n",

			acpi_method_name);

		nouveau_dsm_priv.dsm_detected = true;

		/*

		 * On some systems hotplug events are generated for the device

		 * being switched off when _DSM is executed.  They cause ACPI

		 * hotplug to trigger and attempt to remove the device from

		 * the system, which causes it to break down.  Prevent that from

		 * happening by setting the no_hotplug flag for the involved

		 * ACPI device objects.

		 */

		acpi_bus_no_hotplug(nouveau_dsm_priv.dhandle);

		acpi_bus_no_hotplug(nouveau_dsm_priv.other_handle);

		ret = true;

	}

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ int nouveau_pmops_suspend(struct device *dev) 


	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_ignore_hotplug(pdev);

	pci_set_power_state(pdev, PCI_D3hot);

	return 0;

}

drivers/gpu/drm/radeon/radeon_atpx_handler.c

+2 −14
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ static struct radeon_atpx_priv { 
	bool atpx_detected;

	/* handle for device - and atpx */

	acpi_handle dhandle;

	acpi_handle other_handle;

	struct radeon_atpx atpx;

} radeon_atpx_priv;
@@ -453,10 +452,9 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev) 
		return false;



	status = acpi_get_handle(dhandle, "ATPX", &atpx_handle);

	if (ACPI_FAILURE(status)) {

		radeon_atpx_priv.other_handle = dhandle;

	if (ACPI_FAILURE(status))

		return false;

	}



	radeon_atpx_priv.dhandle = dhandle;

	radeon_atpx_priv.atpx.handle = atpx_handle;

	return true;
@@ -540,16 +538,6 @@ static bool radeon_atpx_detect(void) 
		printk(KERN_INFO "VGA switcheroo: detected switching method %s handle\n",

		       acpi_method_name);

		radeon_atpx_priv.atpx_detected = true;

		/*

		 * On some systems hotplug events are generated for the device

		 * being switched off when ATPX is executed.  They cause ACPI

		 * hotplug to trigger and attempt to remove the device from

		 * the system, which causes it to break down.  Prevent that from

		 * happening by setting the no_hotplug flag for the involved

		 * ACPI device objects.

		 */

		acpi_bus_no_hotplug(radeon_atpx_priv.dhandle);

		acpi_bus_no_hotplug(radeon_atpx_priv.other_handle);

		return true;

	}

	return false;

drivers/gpu/drm/radeon/radeon_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ static int radeon_pmops_runtime_suspend(struct device *dev) 
	ret = radeon_suspend_kms(drm_dev, false, false);

	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_ignore_hotplug(pdev);

	pci_set_power_state(pdev, PCI_D3cold);

	drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;