Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/riastradh-drm2]: src/sys/external/bsd/drm2/i915drm Fix arithmetic in gen...
details: https://anonhg.NetBSD.org/src/rev/01f2799715c6
branches: riastradh-drm2
changeset: 788554:01f2799715c6
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sun Sep 08 16:13:55 2013 +0000
description:
Fix arithmetic in gen6_ggtt_bind_object.
diffstat:
sys/external/bsd/drm2/i915drm/i915_gem_gtt.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (31 lines):
diff -r e4ac33acf361 -r 01f2799715c6 sys/external/bsd/drm2/i915drm/i915_gem_gtt.c
--- a/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c Sun Sep 08 16:13:10 2013 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c Sun Sep 08 16:13:55 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.1.2.4 2013/09/08 16:13:10 riastradh Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.1.2.5 2013/09/08 16:13:55 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.1.2.4 2013/09/08 16:13:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.1.2.5 2013/09/08 16:13:55 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -409,9 +409,10 @@
if (0 < i) {
/* Posting read and sanity check. */
/* XXX Shouldn't there be a bus_space_sync? */
- const uint32_t expected = pte_encode(dev, addr, cache_level);
+ const uint32_t expected = pte_encode(dev, addr - PAGE_SIZE,
+ cache_level);
const uint32_t actual = bus_space_read_4(bst, bsh,
- (first_entry + (4*(i-1))));
+ 4*(first_entry + i-1));
if (actual != expected)
aprint_error_dev(dev->dev, "mismatched PTE"
": 0x%"PRIxMAX" != 0x%"PRIxMAX"\n",
Home |
Main Index |
Thread Index |
Old Index