diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-11-18 10:09:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-11-18 10:09:55 +1000 |
| commit | 46557bef3f3834ac33031c7be27d39d90d507442 (patch) | |
| tree | 5cfc4a9e1263fe0a15e516ca9695ee2f9b8899e4 /drivers/gpu/drm/radeon/r600.c | |
| parent | 4efc50d697ed8d9a91f0005d922907a7b6c9290d (diff) | |
| parent | d91d8a3f88059d93e34ac70d059153ec69a9ffc7 (diff) | |
Merge branch 'drm-core-next' of ../linux-2.6 into drm-next
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 8d6bc12192d..278f646bc18 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1537,6 +1537,20 @@ int r600_startup(struct radeon_device *rdev) return 0; } +void r600_vga_set_state(struct radeon_device *rdev, bool state) +{ + uint32_t temp; + + temp = RREG32(CONFIG_CNTL); + if (state == false) { + temp &= ~(1<<0); + temp |= (1<<1); + } else { + temp &= ~(1<<1); + } + WREG32(CONFIG_CNTL, temp); +} + int r600_resume(struct radeon_device *rdev) { int r; |