Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
christos 2015-10-10 19:29:44 +00:00
parent dd5247cc50
commit 571f38dae1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/external/bsd/drm2/dist/drm/i915/i915_dma.c vendored
View File

@ -1137,8 +1137,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
BUS_SPACE_MAP_PREFETCHABLE, BUS_SPACE_MAP_PREFETCHABLE,
&dev_priv->dri1.gfx_hws_cpu_bsh); &dev_priv->dri1.gfx_hws_cpu_bsh);
if (ret) { if (ret) {
i915_dma_cleanup(dev);
ring->status_page.gfx_addr = 0; ring->status_page.gfx_addr = 0;
i915_dma_cleanup(dev);
DRM_ERROR("can not ioremap virtual address for" DRM_ERROR("can not ioremap virtual address for"
" G33 hw status page\n"); " G33 hw status page\n");
return ret; return ret;