[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Zero out the guard for b...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f3ab9ede5179
branches:  trunk
changeset: 811058:f3ab9ede5179
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 10 19:29:44 2015 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r b6bce464ea6a -r f3ab9ede5179 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sat Oct 10 17:00:12 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sat Oct 10 19:29:44 2015 +0000
@@ -1137,8 +1137,8 @@
            BUS_SPACE_MAP_PREFETCHABLE,
            &dev_priv->dri1.gfx_hws_cpu_bsh);
        if (ret) {
+               ring->status_page.gfx_addr = 0;
                i915_dma_cleanup(dev);
-               ring->status_page.gfx_addr = 0;
                DRM_ERROR("can not ioremap virtual address for"
                                " G33 hw status page\n");
                return ret;