Module Name: src
Committed By: riastradh
Date: Sun Sep 8 15:57:01 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_gem_gtt.c
Log Message:
Shift the GTT size by twenty only once.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.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/i915drm/i915_gem_gtt.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.1.2.1 src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.1.2.2
--- src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.1.2.1 Sun Sep 8 15:52:20 2013
+++ src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c Sun Sep 8 15:57:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.1.2.1 2013/09/08 15:52:20 riastradh Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.1.2.2 2013/09/08 15:57:01 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.1 2013/09/08 15:52:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.1.2.2 2013/09/08 15:57:01 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -137,7 +137,7 @@ i915_gem_gtt_init(struct drm_device *dev
}
/* GGMS: GTT Graphics Memory Size. */
- ggms = __SHIFTOUT(snb_gmch_ctl, SNB_GMCH_GGMS) << 20;
+ ggms = __SHIFTOUT(snb_gmch_ctl, SNB_GMCH_GGMS);
gtt->gtt_total_entries = (ggms << 20) / sizeof(gtt_pte_t);
gtt->gtt_mappable_entries = (dev->bus_maps[2].bm_size >> PAGE_SHIFT);
