diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 16:22:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-01 16:22:38 +1000 |
| commit | 1c62233508ef7104f8a78e571fdf5c72d0dc0200 (patch) | |
| tree | 31e19cbff5c1080d3015d20b24dd43ee95f4ed8c /drivers/gpu/drm/radeon/radeon_kms.c | |
| parent | 6d9c13513661c1991bf5f4e6e1363c721292d819 (diff) | |
| parent | 6a9ee8af344e3bd7dbd61e67037096cdf7f83289 (diff) | |
| download | kernel_samsung_smdk4412-1c62233508ef7104f8a78e571fdf5c72d0dc0200.zip kernel_samsung_smdk4412-1c62233508ef7104f8a78e571fdf5c72d0dc0200.tar.gz kernel_samsung_smdk4412-1c62233508ef7104f8a78e571fdf5c72d0dc0200.tar.bz2 | |
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_kms.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 3c5002e..20ec276 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -30,6 +30,8 @@ #include "radeon.h" #include "radeon_drm.h" +#include <linux/vga_switcheroo.h> + int radeon_driver_unload_kms(struct drm_device *dev) { struct radeon_device *rdev = dev->dev_private; @@ -136,6 +138,7 @@ int radeon_driver_firstopen_kms(struct drm_device *dev) void radeon_driver_lastclose_kms(struct drm_device *dev) { + vga_switcheroo_process_delayed_switch(); } int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) |