diff options
| author | Dave Airlie <airlied@dhcp-40-90.bne.redhat.com> | 2012-09-10 04:28:36 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-29 05:30:21 +0200 |
| commit | 0d69704ae348c03bc216b01e32a0e9a2372be419 (patch) | |
| tree | cb63fed3b11746ffb688ff8fd6efa1c087ee8254 /drivers/gpu/drm/nouveau/nouveau_vga.c | |
| parent | Merge branch 'drm-next' of git://people.freedesktop.org/~robclark/linux into ... (diff) | |
| download | linux-0d69704ae348c03bc216b01e32a0e9a2372be419.tar.xz linux-0d69704ae348c03bc216b01e32a0e9a2372be419.zip | |
gpu/vga_switcheroo: add driver control power feature. (v3)
For optimus and powerxpress muxless we really want the GPU
driver deciding when to power up/down the GPU, not userspace.
This adds the ability for a driver to dynamically power up/down
the GPU and remove the switcheroo from controlling it, the
switcheroo reports the dynamic state to userspace also.
It also adds 2 power domains, one for machine where the power
switch is controlled outside the GPU D3 state, so the powerdown
ordering is done correctly, and the second for the hdmi audio
device to make sure it can resume for PCI config space accesses.
v1.1: fix build with switcheroo off
v2: add power domain support for radeon and v1 nvidia dsms
v2.1: fix typo in off case
v3: add audio power domain for hdmi audio + misc audio fixes
v4: use PCI_SLOT macro, drop power reference on hdmi audio resume
failure also.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_vga.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_vga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index 25d3495725eb..40a09f11a600 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c @@ -79,7 +79,7 @@ nouveau_vga_init(struct nouveau_drm *drm) { struct drm_device *dev = drm->dev; vga_client_register(dev->pdev, dev, NULL, nouveau_vga_set_decode); - vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops); + vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops, false); } void |