Module Name: src
Committed By: christos
Date: Sat Oct 10 19:29:44 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_dma.c
Log Message:
Zero out the guard for bus_space_unmap before calling i915_dma_cleanup() which
calls i915_free_hws(), which then tries to unmap. Perhaps this fixes PR/50060.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.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_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.16 Thu Apr 2 21:06:05 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sat Oct 10 15:29:44 2015
@@ -1137,8 +1137,8 @@ static int i915_set_status_page(struct d
BUS_SPACE_MAP_PREFETCHABLE,
&dev_priv->dri1.gfx_hws_cpu_bsh);
if (ret) {
- i915_dma_cleanup(dev);
ring->status_page.gfx_addr = 0;
+ i915_dma_cleanup(dev);
DRM_ERROR("can not ioremap virtual address for"
" G33 hw status page\n");
return ret;
