diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-13 17:58:08 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-13 17:58:08 +0200 |
| commit | f3b7e17c4bdc0b6675729ece8dd55ed94785f744 (patch) | |
| tree | 2a0954a193d54851ab1994ce38b538418fc7a9f0 /drivers/gpu/drm/radeon | |
| parent | drm/radeon/hdmi: fix some coding style (diff) | |
| parent | vga_switcheroo: Add the support for audio clients (diff) | |
| download | linux-f3b7e17c4bdc0b6675729ece8dd55ed94785f744.tar.xz linux-f3b7e17c4bdc0b6675729ece8dd55ed94785f744.zip | |
Merge branch 'topic/vga-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into drm-core-next
* 'topic/vga-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
vga_switcheroo: Add the support for audio clients
vga_switcheroo: Introduce struct vga_switcheroo_client_ops
vga_switcheroo: Refactor using linked list
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index e1bc7e96f29c..3d41525c1bcf 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -697,6 +697,11 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev) return can_switch; } +static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = { + .set_gpu_state = radeon_switcheroo_set_state, + .reprobe = NULL, + .can_switch = radeon_switcheroo_can_switch, +}; int radeon_device_init(struct radeon_device *rdev, struct drm_device *ddev, @@ -809,10 +814,7 @@ int radeon_device_init(struct radeon_device *rdev, /* this will fail for cards that aren't VGA class devices, just * ignore it */ vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode); - vga_switcheroo_register_client(rdev->pdev, - radeon_switcheroo_set_state, - NULL, - radeon_switcheroo_can_switch); + vga_switcheroo_register_client(rdev->pdev, &radeon_switcheroo_ops); r = radeon_init(rdev); if (r) |