diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-16 11:45:53 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-16 11:45:53 -0700 |
| commit | d313108167a793652a5fe4c1015198e0a9deac4c (patch) | |
| tree | 70702ea339cdcec621a8f7251c673c80a3acb73e /linux-core/radeon_buffer.c | |
| parent | 893315d49ed678de95cf6ac553efb6093cc7343c (diff) | |
| parent | 2030db75328b7d896a5dd030fc171020b33149e1 (diff) | |
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
Diffstat (limited to 'linux-core/radeon_buffer.c')
| -rw-r--r-- | linux-core/radeon_buffer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c index 227a2fa0..900d450a 100644 --- a/linux-core/radeon_buffer.c +++ b/linux-core/radeon_buffer.c @@ -55,10 +55,14 @@ int radeon_invalidate_caches(struct drm_device * dev, uint64_t flags) drm_radeon_private_t *dev_priv = dev->dev_private; RING_LOCALS; + if (!dev_priv->cp_running) + return 0; + BEGIN_RING(4); RADEON_FLUSH_CACHE(); RADEON_FLUSH_ZCACHE(); ADVANCE_RING(); + COMMIT_RING(); return 0; } @@ -261,6 +265,6 @@ uint64_t radeon_evict_flags(struct drm_buffer_object *bo) case DRM_BO_MEM_TT: return DRM_BO_FLAG_MEM_LOCAL; default: - return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED; + return DRM_BO_FLAG_MEM_TT; } } |