Module Name: src
Committed By: riastradh
Date: Mon Aug 27 16:15:35 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_vgpu.c
Log Message:
Simulate bus_space_read_8 with two bus_space_read_4 on 32-bit x86.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_vgpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_vgpu.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_vgpu.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_vgpu.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_vgpu.c:1.3 Mon Aug 27 07:16:10 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_vgpu.c Mon Aug 27 16:15:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_vgpu.c,v 1.3 2018/08/27 07:16:10 riastradh Exp $ */
+/* $NetBSD: i915_vgpu.c,v 1.4 2018/08/27 16:15:34 riastradh Exp $ */
/*
* Copyright(c) 2011-2015 Intel Corporation. All rights reserved.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_vgpu.c,v 1.3 2018/08/27 07:16:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_vgpu.c,v 1.4 2018/08/27 16:15:34 riastradh Exp $");
#include "intel_drv.h"
#include "i915_vgpu.h"
@@ -75,8 +75,15 @@ void i915_check_vgpu(struct drm_device *
return;
#ifdef __NetBSD__
+# ifdef _LP64
magic = bus_space_read_8(dev_priv->regs_bst, dev_priv->regs_bsh,
vgtif_reg(magic));
+# else
+ magic = bus_space_read_4(dev_priv->regs_bst, dev_priv->regs_bsh,
+ vgtif_reg(magic));
+ magic |= (uint64_t)bus_space_read_4(dev_priv->regs_bst,
+ dev_priv->regs_bsh, vgtif_reg(magic) + 4) << 32;
+# endif
#else
magic = readq(dev_priv->regs + vgtif_reg(magic));
#endif
