Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:44:04 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c
i915_gem_render_state.c
Log Message:
uvm_map consumes reference on success, so be sure to acquire another.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.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_cmd_parser.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.9 Mon Aug 27 14:43:48 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c Mon Aug 27 14:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_cmd_parser.c,v 1.9 2018/08/27 14:43:48 riastradh Exp $ */
+/* $NetBSD: i915_cmd_parser.c,v 1.10 2018/08/27 14:44:04 riastradh Exp $ */
/*
* Copyright © 2013 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.9 2018/08/27 14:43:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_cmd_parser.c,v 1.10 2018/08/27 14:44:04 riastradh Exp $");
#include "i915_drv.h"
@@ -873,6 +873,9 @@ static u32 *vmap_batch(struct drm_i915_g
if (error)
return NULL;
+ /* uvm_map consumes a reference on success. */
+ uao_reference(obj->base.filp);
+
return (void *)va;
#else
int i;
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c:1.7 Mon Aug 27 13:43:22 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_render_state.c Mon Aug 27 14:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_render_state.c,v 1.7 2018/08/27 13:43:22 riastradh Exp $ */
+/* $NetBSD: i915_gem_render_state.c,v 1.8 2018/08/27 14:44:04 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_render_state.c,v 1.7 2018/08/27 13:43:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_render_state.c,v 1.8 2018/08/27 14:44:04 riastradh Exp $");
#include "i915_drv.h"
#include "intel_renderstate.h"
@@ -121,6 +121,8 @@ static int render_state_setup(struct ren
UVM_ADV_NORMAL, 0));
if (ret)
return ret;
+ /* uvm_map consumes a reference on success. */
+ uao_reference(so->obj->base.filp);
d = (void *)kva;
#else
page = sg_page(so->obj->pages->sgl);
