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

i915: Evict if relocatee buffer is CACHED_MAPPED before 

writting relocations, otherwise the GPU probably sees some
inconsistent data. Fix fd.o bug#14656
main
Xiang, Haihao 2008-03-05 15:08:46 +08:00
parent a6a2f2c8c4
commit 638353103d
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux-core/drm_bo.c
View File

@ -1066,7 +1066,7 @@ static int drm_bo_busy(struct drm_buffer_object *bo)
return 0;
}
static int drm_bo_evict_cached(struct drm_buffer_object *bo)
int drm_bo_evict_cached(struct drm_buffer_object *bo)
{
int ret = 0;
@ -1076,6 +1076,7 @@ static int drm_bo_evict_cached(struct drm_buffer_object *bo)
return ret;
}
EXPORT_SYMBOL(drm_bo_evict_cached);
/*
* Wait until a buffer is unmapped.
*/

2
linux-core/drm_objects.h
View File

@ -697,7 +697,7 @@ extern int drm_bo_do_validate(struct drm_buffer_object *bo,
uint64_t flags, uint64_t mask, uint32_t hint,
uint32_t fence_class,
struct drm_bo_info_rep *rep);
extern int drm_bo_evict_cached(struct drm_buffer_object *bo);
/*
* Buffer object memory move- and map helpers.
* drm_bo_move.c

7
shared-core/i915_dma.c
View File

@ -806,6 +806,7 @@ struct i915_relocatee_info {
struct drm_bo_kmap_obj kmap;
int is_iomem;
int idle;
int evicted;
};
struct drm_i915_validate_buffer {
@ -878,6 +879,12 @@ int i915_apply_reloc(struct drm_file *file_priv, int num_buffers,
relocatee->data_page = drm_bmo_virtual(&relocatee->kmap,
&relocatee->is_iomem);
relocatee->page_offset = (relocatee->offset & PAGE_MASK);
if (!relocatee->evicted &&
relocatee->buf->mem.flags & DRM_BO_FLAG_CACHED_MAPPED) {
drm_bo_evict_cached(relocatee->buf);
relocatee->evicted = 1;
}
}
val = buffers[buf_index].buffer->offset;