Module Name: src
Committed By: riastradh
Date: Thu Mar 5 01:04:51 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Mark pages dirty after use for write in the aperture (`GTT').
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.26 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.27
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.26 Thu Mar 5 00:55:34 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Thu Mar 5 01:04:51 2015
@@ -380,6 +380,7 @@ i915_gem_object_attach_phys(struct drm_i
kunmap_atomic(src);
#ifdef __NetBSD__
+ /* XXX mark page accessed */
uvm_obj_unwirepages(obj->base.gemo_shm_uao, i*PAGE_SIZE,
(i + 1)*PAGE_SIZE);
#else
@@ -2421,6 +2422,7 @@ static void
i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
{
struct drm_device *const dev = obj->base.dev;
+ struct vm_page *page;
int ret;
/* XXX Cargo-culted from the Linux code. */
@@ -2437,7 +2439,15 @@ i915_gem_object_put_pages_gtt(struct drm
if (i915_gem_object_needs_bit17_swizzle(obj))
i915_gem_object_save_bit_17_swizzle(obj);
- /* XXX Maintain dirty flag? */
+ if (obj->madv == I915_MADV_DONTNEED)
+ obj->dirty = 0;
+
+ if (obj->dirty) {
+ TAILQ_FOREACH(page, &obj->igo_pageq, pageq.queue) {
+ page->flags &= ~PG_CLEAN;
+ /* XXX mark page accessed */
+ }
+ }
bus_dmamap_destroy(dev->dmat, obj->igo_dmamap);
bus_dmamem_unwire_uvm_object(dev->dmat, obj->base.gemo_shm_uao, 0,
