Module Name: src
Committed By: riastradh
Date: Mon May 19 14:55:46 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_gem_gtt.c
Log Message:
Fix page/byte sense of AGP GTT parameter calculations.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.9
--- src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c:1.8 Mon May 19 14:44:36 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c Mon May 19 14:55:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_gtt.c,v 1.8 2014/05/19 14:44:36 riastradh Exp $ */
+/* $NetBSD: i915_gem_gtt.c,v 1.9 2014/05/19 14:55:46 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.8 2014/05/19 14:44:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.9 2014/05/19 14:55:46 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -83,6 +83,16 @@ i915_gem_gtt_init(struct drm_device *dev
if (ret)
goto fail0;
+ aprint_error_dev(dev->dev, "GTT:\n"
+ "- gma_bus_addr %"PRIxMAX"\n"
+ "- gtt_mappable_entries %"PRIxMAX"\n"
+ "- stolen_size %"PRIxMAX"\n"
+ "- gtt_total_entries %"PRIxMAX"\n",
+ (uintmax_t)gtt->gma_bus_addr,
+ (uintmax_t)gtt->gtt_mappable_entries,
+ (uintmax_t)gtt->stolen_size,
+ (uintmax_t)gtt->gtt_total_entries);
+
/*
* The GTT entries are limited to 32-bit physical addresses up
* until gen4, at and after which they are limited to 36-bit
@@ -402,9 +412,9 @@ agp_gtt_init(struct drm_device *dev)
gtt->gma_bus_addr = agp_i810_sc->as_apaddr;
gtt->gtt_mappable_entries = (agp_i810_sc->as_apsize >> AGP_PAGE_SHIFT);
- gtt->stolen_size = (isc->stolen >> AGP_PAGE_SHIFT);
+ gtt->stolen_size = (isc->stolen << AGP_PAGE_SHIFT);
gtt->gtt_total_entries =
- (gtt->gtt_mappable_entries + gtt->stolen_size);
+ (gtt->gtt_mappable_entries + (gtt->stolen_size >> AGP_PAGE_SHIFT));
gtt->gtt_bsh = isc->gtt_bsh;
product = PCI_PRODUCT(dev->pdev->pd_pa.pa_id);
