Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:52:40 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_gtt.c
Log Message:
Zero the scratch page.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.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_gtt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.12 Mon Aug 27 14:49:39 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c Mon Aug 27 14:52:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.12 2018/08/27 14:49:39 riastradh Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.13 2018/08/27 14:52:40 riastradh Exp $ */
/*
* Copyright © 2010 Daniel Vetter
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.12 2018/08/27 14:49:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.13 2018/08/27 14:52:40 riastradh Exp $");
#include <linux/bitmap.h>
#include <linux/err.h>
@@ -321,6 +321,9 @@ static gen6_pte_t iris_pte_encode(dma_ad
return pte;
}
+static void *kmap_page_dma(struct i915_page_dma *);
+static void kunmap_page_dma(struct drm_device *, void *);
+
static int __setup_page_dma(struct drm_device *dev,
struct i915_page_dma *p, gfp_t flags)
{
@@ -354,6 +357,12 @@ fail2: __unused
bus_dmamap_destroy(dev->dmat, p->map);
goto fail1;
}
+
+ if (flags & __GFP_ZERO) {
+ void *va = kmap_page_dma(p);
+ memset(va, 0, PAGE_SIZE);
+ kunmap_page_dma(dev, va);
+ }
#else
struct device *device = &dev->pdev->dev;
