On Wed, Mar 9, 2016 at 7:14 AM, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

This fixes GPU auto powerdown on the Lenovo W541, since we advertise Windows 2013 to the ACPI layer.

Signed-off-by: Dave Airlie airlied@redhat.com

drivers/gpu/drm/nouveau/nouveau_vga.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index af89c36..b987427f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c @@ -101,8 +101,12 @@ nouveau_vga_init(struct nouveau_drm *drm) runtime = true; vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops, runtime);

•   if (runtime && nouveau_is_v1_dsm() && !nouveau_is_optimus())
  

•           vga_switcheroo_init_domain_pm_ops(drm->dev->dev, &drm->vga_pm_domain);
  

•   if (runtime) {
  

•           if (nouveau_is_v1_dsm() && !nouveau_is_optimus())
  

•                   vga_switcheroo_init_domain_pm_ops(drm->dev->dev, &drm->vga_pm_domain);
  

•           else if (nouveau_is_optimus())
  

•                   vga_switcheroo_init_parent_pr3_ops(drm->dev->dev, &drm->vga_pm_domain);
  

•   }
  

}

void @@ -117,7 +121,7 @@ nouveau_vga_fini(struct nouveau_drm *drm) runtime = true;

    vga_switcheroo_unregister_client(dev->pdev);

•   if (runtime && nouveau_is_v1_dsm() && !nouveau_is_optimus())
  

•   if (runtime && (nouveau_is_v1_dsm() || nouveau_is_optimus()))
            vga_switcheroo_fini_domain_pm_ops(drm->dev->dev);
    vga_client_register(dev->pdev, NULL, NULL, NULL);
  

}

Looks reasonable to me.

Thanks, Rafael

On 10 March 2016 at 00:40, Lukas Wunner lukas@wunner.de wrote:

Hi Dave,

On Wed, Mar 09, 2016 at 04:14:05PM +1000, Dave Airlie wrote:

...

From: Dave Airlie airlied@redhat.com

This fixes GPU auto powerdown on the Lenovo W541, since we advertise Windows 2013 to the ACPI layer.

Signed-off-by: Dave Airlie airlied@redhat.com

drivers/gpu/drm/nouveau/nouveau_vga.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index af89c36..b987427f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c @@ -101,8 +101,12 @@ nouveau_vga_init(struct nouveau_drm *drm) runtime = true; vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops, runtime);

• if (runtime && nouveau_is_v1_dsm() && !nouveau_is_optimus())
  

•         vga_switcheroo_init_domain_pm_ops(drm->dev->dev, &drm->vga_pm_domain);
  

• if (runtime) {
  

•         if (nouveau_is_v1_dsm() && !nouveau_is_optimus())
  

The " && !nouveau_is_optimus()" can be dropped because a machine cannot have both. Note the "else" in nouveau_dsm_detect():

I'm pretty sure I've seen a machine with both in my past, back in the Vista/Win7 crossover days.

You're calling this unconditionally for all Optimus machines yet I assume pre Windows 10 machines lack the PR3 hooks.

Yes and I've confirmed on my older machine that nothing bad happens doing it unconditionally, and I couldn't find any bits in the _DSM flags to tell me if I should do something different.

Dave.

On Thursday, March 10, 2016 07:56:41 AM Dave Airlie wrote:

On 9 March 2016 at 23:19, Rafael J. Wysocki rafael@kernel.org wrote:

...

On Wed, Mar 9, 2016 at 7:14 AM, Dave Airlie airlied@gmail.com wrote:

...

From: Dave Airlie airlied@redhat.com

Windows 10 seems to have standardised power control for the optimus/powerxpress laptops using PR3 power resource hooks.

I'm not sure this is definitely the correct place to be doing this, but it works for me here.

The ACPI device for the GPU I have is _SB_.PCI0.PEG_.VID_ but the power resource hooks are on _SB_.PCI0.PEG_, so this patch creates a new power domain to turn the GPU device parent off using standard ACPI calls.

Signed-off-by: Dave Airlie airlied@redhat.com

drivers/gpu/vga/vga_switcheroo.c | 54 +++++++++++++++++++++++++++++++++++++++- include/linux/vga_switcheroo.h | 3 ++- 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index 665ab9f..be32cb2 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -42,7 +42,7 @@ #include <linux/uaccess.h> #include <linux/vgaarb.h> #include <linux/vga_switcheroo.h>

+#include <linux/acpi.h> /**

• DOC: Overview

@@ -997,3 +997,55 @@ vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, return -EINVAL; } EXPORT_SYMBOL(vga_switcheroo_init_domain_pm_optimus_hdmi_audio);

+/* With Windows 10 the runtime suspend/resume can use power

• resources on the parent device */

+static int vga_acpi_switcheroo_runtime_suspend(struct device *dev) +{

•   struct pci_dev *pdev = to_pci_dev(dev);
  

•   int ret;
  

•   struct acpi_device *adev;
  

•   ret = dev->bus->pm->runtime_suspend(dev);
  

•   if (ret)
  

•           return ret;
  

•   ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
  

You can use ACPI_COMPANION(&pdev->dev) for that.

...

•   if (!ret)
  

•           acpi_device_set_power(adev->parent, ACPI_STATE_D3_COLD);
  

Won't that mess up with the PM of the parent? Or do we know that the parent won't do its own PM?

The parent is always going to be pcieport.

I see.

It doesn't seem to do any runtime PM, I do wonder if pcieport should be doing it's own runtime PM handling, but that is a larger task than I'm thinking to tackle here.

PCIe ports don't do PM - yet. Mika has posted a series of patches to implement that, however, that are waiting for comments now:

https://patchwork.kernel.org/patch/8453311/ https://patchwork.kernel.org/patch/8453381/ https://patchwork.kernel.org/patch/8453391/ https://patchwork.kernel.org/patch/8453411/ https://patchwork.kernel.org/patch/8453371/ https://patchwork.kernel.org/patch/8453351/

Maybe I should be doing

pci_set_power_state(pdev->bus->self, PCI_D3cold) ? I'm not really sure.

Using pci_set_power_state() would be more appropriate IMO, but you can get to the bridge via dev->parent too, can't you?

In any case, it looks like you and Mika need to talk. :-)

I'm guessing on Windows this all happens automatically.

PCIe ports are power-managend by (newer) Windows AFAICS, but we know for a fact that this simply doesn't work reliably on some older hardware which is why we don't do that. I suppose that the Windows in question uses a cut-off date or similar to decide what do do with PCIe ports PM.

Thanks, Rafael

On Mon, Mar 14, 2016 at 12:19:14PM +1000, Dave Airlie wrote:

On 11 March 2016 at 23:45, Rafael J. Wysocki rjw@rjwysocki.net wrote:

...

On Friday, March 11, 2016 12:58:15 PM Mika Westerberg wrote:

...

On Thu, Mar 10, 2016 at 09:57:09PM +0100, Rafael J. Wysocki wrote:

...

...

It doesn't seem to do any runtime PM, I do wonder if pcieport should be doing it's own runtime PM handling, but that is a larger task than I'm thinking to tackle here.

PCIe ports don't do PM - yet. Mika has posted a series of patches to implement that, however, that are waiting for comments now:

https://patchwork.kernel.org/patch/8453311/ https://patchwork.kernel.org/patch/8453381/ https://patchwork.kernel.org/patch/8453391/ https://patchwork.kernel.org/patch/8453411/ https://patchwork.kernel.org/patch/8453371/ https://patchwork.kernel.org/patch/8453351/

...

Maybe I should be doing

pci_set_power_state(pdev->bus->self, PCI_D3cold) ? I'm not really sure.

Using pci_set_power_state() would be more appropriate IMO, but you can get to the bridge via dev->parent too, can't you?

In any case, it looks like you and Mika need to talk. :-)

When the vga_switcheroo device gets runtime suspended (with the above runtime PM patchs for PCIe root ports) the root port should also be runtime suspended by the PM core.

Right, after your patches have been applied, the additional handling won't be needed.

So Dave, maybe you can check if the Mika's patches help?

Hi Mika,

I tested your patches with a couple of changes on the Lenovo W541.

Thanks for testing.

The attached patch contains the two things I needed to get the same functionality as my patches.

I'm really not in love with the per-chipset enablement for this, really any chipsets after a certain year should probably be better, as we'll constantly be adding PCI Ids for every chipset ever made, and I expect we'll forget some.

Bjorn also had the same comment. I think I'll change it to use cut-off date instead of list of PCI IDs of nobody objects.

Dave.

From eea412076c9d24262ebd4811f766d5379b728045 Mon Sep 17 00:00:00 2001 From: Dave Airlie airlied@redhat.com Date: Mon, 14 Mar 2016 23:37:43 +1000 Subject: [PATCH] [RFC] PCI: enable runtime PM on pcieports to let secondary GPUs powerdown.

With secondary GPUs in Windows 10 laptops we need to use runtime PM to power down the PCIe ports after the devices goes to D3Cold.

This patch adds the PCI ID for the Haswell 16x PCIE slot found in the W541 laptops. I should probably try and gather the PCI IDs, for broadwell/skylake variants as well if we can't find them.

This fixes a regression on W541 laptops on top of Mika's PCIE patches since we started advertising Windows 2013 ACPI.

[probably should be two patches - hence RFC]

Signed-off-by: Dave Airlie airlied@redhat.com

drivers/pci/pcie/portdrv_pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 43dd23e..1405de8 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -278,8 +278,10 @@ static int pcie_portdrv_probe(struct pci_dev *dev,

pci_save_state(dev);

• if (pcie_port_runtime_suspend_allowed(dev))

• if (pcie_port_runtime_suspend_allowed(dev)) {

• pm_runtime_allow(&dev->dev);
  

PCI drivers typically have left this decision up to the userspace. I'm wondering whether it is good idea to deviate from that here? Of course this allows immediate power savings but could potentially cause problems as well.

I think we need to add corresponding call to pm_runtime_forbid() in pcie_portdrv_remove().

pm_runtime_put_noidle(&dev->dev);

• }

  return 0;

} @@ -436,6 +438,8 @@ static void pcie_portdrv_err_resume(struct pci_dev *dev)

• LINUX Device Driver Model

*/ static const struct pci_device_id port_pci_ids[] = {

• /* Intel Skylake PCIE graphics port */
• { PCI_VDEVICE(INTEL, 0x0c01), .driver_data = PCIE_PORT_SPT }, /* Intel Broxton */ { PCI_VDEVICE(INTEL, 0x1ad6), .driver_data = PCIE_PORT_SPT }, { PCI_VDEVICE(INTEL, 0x1ad7), .driver_data = PCIE_PORT_SPT },

-- 2.5.0

On Wed, Mar 9, 2016 at 9:33 AM, Lukas Wunner lukas@wunner.de wrote:

Hi Dave,

On Wed, Mar 09, 2016 at 04:14:04PM +1000, Dave Airlie wrote:

...

From: Dave Airlie airlied@redhat.com

Windows 10 seems to have standardised power control for the optimus/powerxpress laptops using PR3 power resource hooks.

What happened to the Optimus DSM, does this still work? If not, echoing OFF to the vgaswitcheroo sysfs file won't power down the GPU now, right? (If runtime pm is disabled in nouveau.)

If the OS identifies itself as windows 10 or newer when initializing ACPI, the standardized interfaces should be used if they exist. I'm not sure if there is any explicit policy on the vendor specific ones, but I suspect they are probably broken in that case since I doubt the OEM validates them when the standardized interfaces are available.

Alex

...

I'm not sure this is definitely the correct place to be doing this, but it works for me here.

How about implementing an additional vga_switcheroo handler somewhere in drivers/acpi/, which looks for the PR3 hooks and registers with vga_switcheroo if found. The ->power_state callback of that handler would then invoke acpi_device_set_power().

The ACPI bus is scanned in the subsys_initcall section, much earlier than nouveau is loaded (in the device_initcall section). So the ACPI vga_switcheroo handler could register before the nouveau DSM handler and therefore would always have a higher precedence.

In any case this patch should be amended with kerneldoc for vga_switcheroo_init_parent_pr3_ops(), I've spent considerable time last year to document everything and kindly ask that this water not be muddied again. ;-)

One small nit, the headers are sorted alphabetically yet acpi.h is added at the end.

Thanks,

Lukas

...

The ACPI device for the GPU I have is _SB_.PCI0.PEG_.VID_ but the power resource hooks are on _SB_.PCI0.PEG_, so this patch creates a new power domain to turn the GPU device parent off using standard ACPI calls.

Signed-off-by: Dave Airlie airlied@redhat.com

drivers/gpu/vga/vga_switcheroo.c | 54 +++++++++++++++++++++++++++++++++++++++- include/linux/vga_switcheroo.h | 3 ++- 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index 665ab9f..be32cb2 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -42,7 +42,7 @@ #include <linux/uaccess.h> #include <linux/vgaarb.h> #include <linux/vga_switcheroo.h>

+#include <linux/acpi.h> /**

• DOC: Overview

@@ -997,3 +997,55 @@ vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, return -EINVAL; } EXPORT_SYMBOL(vga_switcheroo_init_domain_pm_optimus_hdmi_audio);

+/* With Windows 10 the runtime suspend/resume can use power

• resources on the parent device */

+static int vga_acpi_switcheroo_runtime_suspend(struct device *dev) +{

• struct pci_dev *pdev = to_pci_dev(dev);
  

• int ret;
  

• struct acpi_device *adev;
  

• ret = dev->bus->pm->runtime_suspend(dev);
  

• if (ret)
  

•         return ret;
  

• ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
  

• if (!ret)
  

•         acpi_device_set_power(adev->parent, ACPI_STATE_D3_COLD);
  

• return 0;
  

+}

+static int vga_acpi_switcheroo_runtime_resume(struct device *dev) +{

• struct pci_dev *pdev = to_pci_dev(dev);
  

• struct acpi_device *adev;
  

• int ret;
  

• ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
  

• if (!ret)
  

•         acpi_device_set_power(adev->parent, ACPI_STATE_D0);
  

• ret = dev->bus->pm->runtime_resume(dev);
  

• if (ret)
  

•         return ret;
  

• return 0;
  

+}

+int vga_switcheroo_init_parent_pr3_ops(struct device *dev,

•                                struct dev_pm_domain *domain)
  

+{

• /* copy over all the bus versions */
  

• if (dev->bus && dev->bus->pm) {
  

•         domain->ops = *dev->bus->pm;
  

•         domain->ops.runtime_suspend = vga_acpi_switcheroo_runtime_suspend;
  

•         domain->ops.runtime_resume = vga_acpi_switcheroo_runtime_resume;
  

•         dev_pm_domain_set(dev, domain);
  

•         return 0;
  

• }
  

• dev_pm_domain_set(dev, NULL);
  

• return -EINVAL;
  

+} +EXPORT_SYMBOL(vga_switcheroo_init_parent_pr3_ops); diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h index 69e1d4a1..5ce0cbe 100644 --- a/include/linux/vga_switcheroo.h +++ b/include/linux/vga_switcheroo.h @@ -144,6 +144,7 @@ void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain); void vga_switcheroo_fini_domain_pm_ops(struct device *dev); int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain); +int vga_switcheroo_init_parent_pr3_ops(struct device *dev, struct dev_pm_domain *domain); #else

static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {} @@ -163,6 +164,6 @@ static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {} static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }

+static inline int vga_switcheroo_init_parent_pr3_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } #endif

#endif /* _LINUX_VGA_SWITCHEROO_H_ */

2.5.0

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Wed, Mar 9, 2016 at 3:17 PM, Lukas Wunner lukas@wunner.de wrote:

Hi,

On Wed, Mar 09, 2016 at 11:52:33AM -0500, Alex Deucher wrote:

...

On Wed, Mar 9, 2016 at 9:33 AM, Lukas Wunner lukas@wunner.de wrote:

...

On Wed, Mar 09, 2016 at 04:14:04PM +1000, Dave Airlie wrote:

...

From: Dave Airlie airlied@redhat.com

Windows 10 seems to have standardised power control for the optimus/powerxpress laptops using PR3 power resource hooks.

What happened to the Optimus DSM, does this still work? If not, echoing OFF to the vgaswitcheroo sysfs file won't power down the GPU now, right? (If runtime pm is disabled in nouveau.)

If the OS identifies itself as windows 10 or newer when initializing ACPI, the standardized interfaces should be used if they exist. I'm not sure if there is any explicit policy on the vendor specific ones, but I suspect they are probably broken in that case since I doubt the OEM validates them when the standardized interfaces are available.

The vendor interface (Optimus DSM) must be present, otherwise the call to nouveau_is_optimus() in patch [2/2] would return false.

But indeed it seems to not be working, otherwise why would the patches be necessary?

It may be present, but I doubt it's functional. I can't speak for nvidia's implementation, but for AMD, ATPX is present, but when you parse the supported functions there is a flag saying that you need to use the PR3 interface instead. Maybe nvidia has something similar. Then the driver could select whether to use the PR3 helpers or the vendor specific interface.

Alex

My point is that the chosen approach does not square with vga_switcheroo's architecture: Normally it's the handler's job to power the GPU up/down. If runtime pm is enabled then vga_switcheroo_init_domain_pm_ops() activates runtime_suspend/_resume callbacks which ask the handler to flip the power switch.

However these two patches add *additional* runtime_suspend/_resume callbacks which do not rely on the handler at all. The handler is thus useless. This becomes apparent when loading the nouveau module with runpm=0: Normally the user is then able to manually power the GPU up/down by echoing ON or OFF to the vgaswitcheroo sysfs file. With the chosen approach this will likely not work because the handler only knows how to invoke the DSM, it doesn't know anything about PR3.

Hence my suggestion to solve this with an additional handler which gets used in lieu of the nouveau DSM handler.

Best regards,

Lukas

...

Alex

...

...

I'm not sure this is definitely the correct place to be doing this, but it works for me here.

How about implementing an additional vga_switcheroo handler somewhere in drivers/acpi/, which looks for the PR3 hooks and registers with vga_switcheroo if found. The ->power_state callback of that handler would then invoke acpi_device_set_power().

The ACPI bus is scanned in the subsys_initcall section, much earlier than nouveau is loaded (in the device_initcall section). So the ACPI vga_switcheroo handler could register before the nouveau DSM handler and therefore would always have a higher precedence.

In any case this patch should be amended with kerneldoc for vga_switcheroo_init_parent_pr3_ops(), I've spent considerable time last year to document everything and kindly ask that this water not be muddied again. ;-)

One small nit, the headers are sorted alphabetically yet acpi.h is added at the end.

Thanks,

Lukas

...

The ACPI device for the GPU I have is _SB_.PCI0.PEG_.VID_ but the power resource hooks are on _SB_.PCI0.PEG_, so this patch creates a new power domain to turn the GPU device parent off using standard ACPI calls.

Signed-off-by: Dave Airlie airlied@redhat.com

drivers/gpu/vga/vga_switcheroo.c | 54 +++++++++++++++++++++++++++++++++++++++- include/linux/vga_switcheroo.h | 3 ++- 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index 665ab9f..be32cb2 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -42,7 +42,7 @@ #include <linux/uaccess.h> #include <linux/vgaarb.h> #include <linux/vga_switcheroo.h>

+#include <linux/acpi.h> /**

• DOC: Overview

@@ -997,3 +997,55 @@ vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, return -EINVAL; } EXPORT_SYMBOL(vga_switcheroo_init_domain_pm_optimus_hdmi_audio);

+/* With Windows 10 the runtime suspend/resume can use power

• resources on the parent device */

+static int vga_acpi_switcheroo_runtime_suspend(struct device *dev) +{

• struct pci_dev *pdev = to_pci_dev(dev);
  

• int ret;
  

• struct acpi_device *adev;
  

• ret = dev->bus->pm->runtime_suspend(dev);
  

• if (ret)
  

•         return ret;
  

• ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
  

• if (!ret)
  

•         acpi_device_set_power(adev->parent, ACPI_STATE_D3_COLD);
  

• return 0;
  

+}

+static int vga_acpi_switcheroo_runtime_resume(struct device *dev) +{

• struct pci_dev *pdev = to_pci_dev(dev);
  

• struct acpi_device *adev;
  

• int ret;
  

• ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev);
  

• if (!ret)
  

•         acpi_device_set_power(adev->parent, ACPI_STATE_D0);
  

• ret = dev->bus->pm->runtime_resume(dev);
  

• if (ret)
  

•         return ret;
  

• return 0;
  

+}

+int vga_switcheroo_init_parent_pr3_ops(struct device *dev,

•                                struct dev_pm_domain *domain)
  

+{

• /* copy over all the bus versions */
  

• if (dev->bus && dev->bus->pm) {
  

•         domain->ops = *dev->bus->pm;
  

•         domain->ops.runtime_suspend = vga_acpi_switcheroo_runtime_suspend;
  

•         domain->ops.runtime_resume = vga_acpi_switcheroo_runtime_resume;
  

•         dev_pm_domain_set(dev, domain);
  

•         return 0;
  

• }
  

• dev_pm_domain_set(dev, NULL);
  

• return -EINVAL;
  

+} +EXPORT_SYMBOL(vga_switcheroo_init_parent_pr3_ops); diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h index 69e1d4a1..5ce0cbe 100644 --- a/include/linux/vga_switcheroo.h +++ b/include/linux/vga_switcheroo.h @@ -144,6 +144,7 @@ void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain); void vga_switcheroo_fini_domain_pm_ops(struct device *dev); int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain); +int vga_switcheroo_init_parent_pr3_ops(struct device *dev, struct dev_pm_domain *domain); #else

static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {} @@ -163,6 +164,6 @@ static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {} static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }

+static inline int vga_switcheroo_init_parent_pr3_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } #endif

#endif /* _LINUX_VGA_SWITCHEROO_H_ */

2.5.0