diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-13 16:17:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-13 16:17:41 +1000 |
| commit | 194fda0dd83623f7927d505e39008c73fbc1c141 (patch) | |
| tree | 80ad7b8eb803ec8712465e74e584ad846c8b35a8 /drivers/gpu/drm/radeon/radeon_ttm.c | |
| parent | ef14587706521287f1c7ea3326e732f7d86dd096 (diff) | |
| parent | 9270eb1b496cb002d75f49ef82c9ef4cbd22a5a0 (diff) | |
| download | kernel_samsung_smdk4412-194fda0dd83623f7927d505e39008c73fbc1c141.zip kernel_samsung_smdk4412-194fda0dd83623f7927d505e39008c73fbc1c141.tar.gz kernel_samsung_smdk4412-194fda0dd83623f7927d505e39008c73fbc1c141.tar.bz2 | |
Merge remote branch 'korg/drm-radeon-next' into drm-linus
* korg/drm-radeon-next
drm/radeon/kms: only evict to GTT if CP is ready
drm/radeon/kms: Fix crash getting TV info with no BIOS.
drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
drm/radeon/kms/r6xx+: make irq handler less verbose
drm/radeon/kms: fix up LVDS handling on macs (v2)
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index a004507..db820ae 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -215,7 +215,10 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo, rbo = container_of(bo, struct radeon_bo, tbo); switch (bo->mem.mem_type) { case TTM_PL_VRAM: - radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT); + if (rbo->rdev->cp.ready == false) + radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_CPU); + else + radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT); break; case TTM_PL_TT: default: |