From e5a34f8222628a17b9abf48e9976b0f22ad8adf3 Mon Sep 17 00:00:00 2001 From: riastradh Date: Sat, 26 Jul 2014 14:26:04 +0000 Subject: [PATCH] Fix __raw_i915_read64 on i386. From rjs@. --- sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c index fb42e8269ade..9aadab683507 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c +++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c @@ -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