Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:23:22 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
src/sys/external/bsd/drm2/include/linux: mm.h
Log Message:
Implement set_page_dirty. Reduce diff a little.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/mm.h
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.43 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.44
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.43 Mon Aug 27 07:19:01 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Mon Aug 27 07:23:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem.c,v 1.43 2018/08/27 07:19:01 riastradh Exp $ */
+/* $NetBSD: i915_gem.c,v 1.44 2018/08/27 07:23:22 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.43 2018/08/27 07:19:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.44 2018/08/27 07:23:22 riastradh Exp $");
#ifdef __NetBSD__
#if 0 /* XXX uvmhist option? */
@@ -310,13 +310,12 @@ i915_gem_object_put_pages_phys(struct dr
memcpy(dst, vaddr, PAGE_SIZE);
kunmap_atomic(dst);
+ set_page_dirty(page);
#ifdef __NetBSD__
- page->p_vmp.flags &= ~PG_CLEAN;
/* XXX mark page accessed */
uvm_obj_unwirepages(obj->base.filp, i*PAGE_SIZE,
(i+1)*PAGE_SIZE);
#else
- set_page_dirty(page);
if (obj->madv == I915_MADV_WILLNEED)
mark_page_accessed(page);
page_cache_release(page);
Index: src/sys/external/bsd/drm2/include/linux/mm.h
diff -u src/sys/external/bsd/drm2/include/linux/mm.h:1.7 src/sys/external/bsd/drm2/include/linux/mm.h:1.8
--- src/sys/external/bsd/drm2/include/linux/mm.h:1.7 Mon Aug 27 06:06:41 2018
+++ src/sys/external/bsd/drm2/include/linux/mm.h Mon Aug 27 07:23:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.h,v 1.7 2018/08/27 06:06:41 riastradh Exp $ */
+/* $NetBSD: mm.h,v 1.8 2018/08/27 07:23:22 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
#include <asm/page.h>
#include <linux/shrinker.h>
-
struct file;
/* XXX Ugh bletch! Whattakludge! Linux's sense is reversed... */
@@ -84,4 +83,11 @@ kvfree(void * ptr)
panic("Unimplemented");
}
+static inline void
+set_page_dirty(struct page *page)
+{
+
+ page->p_vmp.flags &= ~PG_CLEAN;
+}
+
#endif /* _LINUX_MM_H_ */
