[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 fix the same bug on the ...

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

details:   https://anonhg.NetBSD.org/src/rev/cb141d0d1aac
branches:  trunk
changeset: 811059:cb141d0d1aac
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 10 19:35:15 2015 +0000

description:
fix the same bug on the linux side, print the error, and return the -tive
error to mimick linux.

diffstat:

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

diffs (24 lines):

diff -r f3ab9ede5179 -r cb141d0d1aac sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sat Oct 10 19:29:44 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Sat Oct 10 19:35:15 2015 +0000
@@ -1140,8 +1140,8 @@
                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;
+                   " G33 hw status page, error %d\n", ret);
+               return -ret;
        }
 
        __CTASSERT(PAGE_SIZE == 4096);
@@ -1151,8 +1151,8 @@
        dev_priv->dri1.gfx_hws_cpu_addr =
                ioremap_wc(dev_priv->gtt.mappable_base + hws->addr, 4096);
        if (dev_priv->dri1.gfx_hws_cpu_addr == NULL) {
+               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 -ENOMEM;