[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix __raw_i915_read64 on...

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

details:   https://anonhg.NetBSD.org/src/rev/1c69798cf0fd
branches:  trunk
changeset: 330991:1c69798cf0fd
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Jul 26 14:26:04 2014 +0000

description:
Fix __raw_i915_read64 on i386.  From rjs@.

diffstat:

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

diffs (12 lines):

diff -r fe4920e0ad7c -r 1c69798cf0fd sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Sat Jul 26 14:24:08 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Sat Jul 26 14:26:04 2014 +0000
@@ -42,7 +42,7 @@
 #define        __raw_i915_read64(dev_priv, reg) bus_space_read_8((dev_priv)->regs_bst, (dev_priv)->regs_bsh, (reg))
 #define        __raw_i915_write64(dev_priv, reg, val) bus_space_write_8((dev_priv)->regs_bst, (dev_priv)->regs_bsh, (reg), (val))
 #else
-#define        __raw_i915_read64(dev_priv, reg) (bus_space_read_4((dev_priv)->regs_bst, (dev_priv)->regs_bsh, (reg)) | ((uint64_t)bus_space_read_4((dev_priv)->regs_bst, (dev_priv)->regs_bsh, (reg)) 
<< 32))
+#define        __raw_i915_read64(dev_priv, reg) (bus_space_read_4((dev_priv)->regs_bst, (dev_priv)->regs_bsh, (reg)) | ((uint64_t)bus_space_read_4((dev_priv)->regs_bst, (dev_priv)->regs_bsh, (reg) + 
4) << 32))
 #define        __raw_i915_write64(dev_priv, reg, val) (bus_space_write_4((dev_priv)->regs_bst, (dev_priv)->regs_bsh, (reg), (uint32_t)(val)), bus_space_write_4((dev_priv)->regs_bst, 
(dev_priv)->regs_bsh, (reg) + 4, (uint32_t)((val) >> 32)))
 #endif