diff options
| author | Jeremy Kolb <jkolb@brandeis.edu> | 2007-10-31 20:14:48 -0400 |
|---|---|---|
| committer | Jeremy Kolb <jkolb@brandeis.edu> | 2007-10-31 20:14:48 -0400 |
| commit | 9416541fb29666c630f2bcfcc0f3ae0b6c4436d8 (patch) | |
| tree | e9eb35ec99c6173967202518faea490f593be9cf /linux-core/drm_agpsupport.c | |
| parent | 31847b4b62575739a164e019b33ced0531683403 (diff) | |
| parent | 61cbcb5dbe487c6d4eba04794cbaa0279ab807b0 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm
Diffstat (limited to 'linux-core/drm_agpsupport.c')
| -rw-r--r-- | linux-core/drm_agpsupport.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c index 8c7f570e..7c50f411 100644 --- a/linux-core/drm_agpsupport.c +++ b/linux-core/drm_agpsupport.c @@ -541,11 +541,15 @@ static int drm_agp_bind_ttm(struct drm_ttm_backend *backend, container_of(backend, struct drm_agp_ttm_backend, backend); DRM_AGP_MEM *mem = agp_be->mem; int ret; + int snooped = (bo_mem->flags & DRM_BO_FLAG_CACHED) && !(bo_mem->flags & DRM_BO_FLAG_CACHED_MAPPED); DRM_DEBUG("drm_agp_bind_ttm\n"); mem->is_flushed = TRUE; - mem->type = (bo_mem->flags & DRM_BO_FLAG_CACHED) ? AGP_USER_CACHED_MEMORY : - AGP_USER_MEMORY; + mem->type = AGP_USER_MEMORY; + /* CACHED MAPPED implies not snooped memory */ + if (snooped) + mem->type = AGP_USER_CACHED_MEMORY; + ret = drm_agp_bind_memory(mem, bo_mem->mm_node->start); if (ret) { DRM_ERROR("AGP Bind memory failed\n"); |