geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evict cached_mapped relocatee before applying reloc. 

Fix that got left out after the intel-post-reloc merge.
main
Thomas Hellstrom 2008-03-17 11:37:10 +01:00
parent 1f96e9a982
commit 602800a280
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux-core/i915_execbuf.c
View File

@ -138,6 +138,8 @@ int i915_apply_reloc(struct drm_file *file_priv, int num_buffers,
new_cmd_offset = reloc[0]; new_cmd_offset = reloc[0];
if (!relocatee->data_page || if (!relocatee->data_page ||
!drm_bo_same_page(relocatee->offset, new_cmd_offset)) { !drm_bo_same_page(relocatee->offset, new_cmd_offset)) {
struct drm_bo_mem_reg *mem = &relocatee->buf->mem;
drm_bo_kunmap(&relocatee->kmap); drm_bo_kunmap(&relocatee->kmap);
relocatee->data_page = NULL; relocatee->data_page = NULL;
relocatee->offset = new_cmd_offset; relocatee->offset = new_cmd_offset;
@ -149,6 +151,10 @@ int i915_apply_reloc(struct drm_file *file_priv, int num_buffers,
relocatee->idle = I915_RELOC_IDLE; relocatee->idle = I915_RELOC_IDLE;
} }
if (unlikely((mem->mem_type != DRM_BO_MEM_LOCAL) &&
(mem->flags & DRM_BO_FLAG_CACHED_MAPPED)))
drm_bo_evict_cached(relocatee->buf);
ret = drm_bo_kmap(relocatee->buf, new_cmd_offset >> PAGE_SHIFT, ret = drm_bo_kmap(relocatee->buf, new_cmd_offset >> PAGE_SHIFT,
1, &relocatee->kmap); 1, &relocatee->kmap);
if (ret) { if (ret) {