diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-09-15 01:07:52 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-18 06:17:30 (GMT) |
| commit | bc1a631e5104317cc8b4ef7d14adc597f2844003 (patch) | |
| tree | 687818dd6f32bb2374751cde1e2ce94358de786c /drivers/gpu/drm/radeon/r600_blit_kms.c | |
| parent | 698443d9ec1a33eff65b27b9514e06998bf57eb3 (diff) | |
| download | linux-fsl-qoriq-bc1a631e5104317cc8b4ef7d14adc597f2844003.tar.xz | |
drm/radeon/r600: fix some issues with suspend/resume.
a) don't zero gart table on gart enable
b) move pinning shader object into resume path
c) unpin shader object on suspend
d) set cp ready to false after cp shutdown on suspend.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_blit_kms.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_blit_kms.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 1287f4d..0a6f468 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c @@ -481,15 +481,8 @@ int r600_blit_init(struct radeon_device *rdev) return r; } - r = radeon_object_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM, - &rdev->r600_blit.shader_gpu_addr); - if (r) { - DRM_ERROR("failed to pin blit object %d\n", r); - return r; - } - - DRM_DEBUG("r6xx blit allocated bo @ 0x%16llx %08x vs %08x ps %08x\n", - rdev->r600_blit.shader_gpu_addr, obj_size, + DRM_DEBUG("r6xx blit allocated bo %08x vs %08x ps %08x\n", + obj_size, rdev->r600_blit.vs_offset, rdev->r600_blit.ps_offset); r = radeon_object_kmap(rdev->r600_blit.shader_obj, &ptr); |