diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-08-25 18:05:43 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-08-25 18:05:43 -0400 |
| commit | 2e83cca8d7efaf1a6836cfb9ea5893fd9d70175f (patch) | |
| tree | 0921618b5cc692758a7a1dddaac887ca2c79d58d /src/r6xx_accel.c | |
| parent | 65852de027989c105246fa4e4eed432f29525a22 (diff) | |
r6xx/r7xx: more cs exa wip
Diffstat (limited to 'src/r6xx_accel.c')
| -rw-r--r-- | src/r6xx_accel.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c index 4aa4650..6e4c8ea 100644 --- a/src/r6xx_accel.c +++ b/src/r6xx_accel.c @@ -1188,7 +1188,7 @@ r600_cp_start(ScrnInfoPtr pScrn) #if defined(XF86DRM_MODE) if (info->cs) { if (!r600_vb_get(pScrn)) - return FALSE; + return -1; radeon_cs_space_reset_bos(info->cs); radeon_cs_space_add_persistent_bo(info->cs, accel_state->shaders_bo, RADEON_GEM_DOMAIN_VRAM, 0); @@ -1198,10 +1198,12 @@ r600_cp_start(ScrnInfoPtr pScrn) if (accel_state->src_bo[1]) radeon_cs_space_add_persistent_bo(info->cs, accel_state->src_bo[1], RADEON_GEM_DOMAIN_VRAM, 0); - radeon_cs_space_add_persistent_bo(info->cs, accel_state->dst_bo, - RADEON_GEM_DOMAIN_VRAM, 0); - radeon_cs_space_add_persistent_bo(info->cs, accel_state->vb_bo, - RADEON_GEM_DOMAIN_GTT, 0); + if (accel_state->dst_bo) + radeon_cs_space_add_persistent_bo(info->cs, accel_state->dst_bo, + RADEON_GEM_DOMAIN_VRAM, 0); + if (accel_state->vb_bo) + radeon_cs_space_add_persistent_bo(info->cs, accel_state->vb_bo, + RADEON_GEM_DOMAIN_GTT, 0); if (accel_state->copy_area_bo) radeon_cs_space_add_persistent_bo(info->cs, accel_state->copy_area_bo, |