Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 print the error from bus...



details:   https://anonhg.NetBSD.org/src/rev/a23daf85c026
branches:  trunk
changeset: 330540:a23daf85c026
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jul 13 15:15:06 2014 +0000

description:
print the error from bus_space_map.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_display.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r eac406346661 -r a23daf85c026 sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Sun Jul 13 15:12:27 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Sun Jul 13 15:15:06 2014 +0000
@@ -8969,14 +8969,14 @@
                vga_reg = VGACNTRL;
 
 #ifdef __NetBSD__
-    {
        const bus_size_t vgabase = 0x3c0;
        const bus_space_tag_t iot = dev->pdev->pd_pa.pa_iot;
        bus_space_handle_t ioh;
-
-       if (bus_space_map(iot, vgabase, 0x10, 0, &ioh)) {
+       int error;
+
+       if ((error = bus_space_map(iot, vgabase, 0x10, 0, &ioh)) != 0) {
                aprint_error_dev(dev->pdev->pd_dev,
-                   "unable to map VGA registers");
+                   "unable to map VGA registers (error %d)\n", error);
        } else {
                CTASSERT(vgabase <= VGA_SR_INDEX);
                CTASSERT(vgabase <= VGA_SR_DATA);
@@ -8986,7 +8986,6 @@
                    (sr1 | __BIT(5)));
                bus_space_unmap(iot, ioh, 0x10);
        }
-    }
 #else
        vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
        outb(SR01, VGA_SR_INDEX);



Home | Main Index | Thread Index | Old Index