aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_drv.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-01 16:22:38 +1000
committerDave Airlie <airlied@redhat.com>2010-03-01 16:22:38 +1000
commit1c62233508ef7104f8a78e571fdf5c72d0dc0200 (patch)
tree31e19cbff5c1080d3015d20b24dd43ee95f4ed8c /drivers/gpu/drm/radeon/radeon_drv.c
parent6d9c13513661c1991bf5f4e6e1363c721292d819 (diff)
parent6a9ee8af344e3bd7dbd61e67037096cdf7f83289 (diff)
downloadmrst-s0i3-test-1c62233508ef7104f8a78e571fdf5c72d0dc0200.tar.gz
mrst-s0i3-test-1c62233508ef7104f8a78e571fdf5c72d0dc0200.tar.xz
mrst-s0i3-test-1c62233508ef7104f8a78e571fdf5c72d0dc0200.zip
Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage
* 'gpu-switcher' of /ssd/git//linux-2.6: vga_switcheroo: initial implementation (v15) fb: for framebuffer handover don't exit the loop early. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/radeon/Makefile drivers/gpu/drm/radeon/radeon.h
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index be99d4e55a3..f6456e02d1f 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -343,6 +343,7 @@ static int __init radeon_init(void)
driver = &kms_driver;
driver->driver_features |= DRIVER_MODESET;
driver->num_ioctls = radeon_max_kms_ioctl;
+ radeon_register_atpx_handler();
}
/* if the vga console setting is enabled still
* let modprobe override it */
@@ -352,6 +353,7 @@ static int __init radeon_init(void)
static void __exit radeon_exit(void)
{
drm_exit(driver);
+ radeon_unregister_atpx_handler();
}
module_init(radeon_init);