Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:20:39 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_stolen.c
Log Message:
Re-enable i915 GSM now that pci_bus_config_read/write_* is here.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.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_gem_stolen.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c:1.9 Mon Aug 27 07:17:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c Mon Aug 27 07:20:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_stolen.c,v 1.9 2018/08/27 07:17:35 riastradh Exp $ */
+/* $NetBSD: i915_gem_stolen.c,v 1.10 2018/08/27 07:20:39 riastradh Exp $ */
/*
* Copyright © 2008-2012 Intel Corporation
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.9 2018/08/27 07:17:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.10 2018/08/27 07:20:39 riastradh Exp $");
#include <linux/printk.h>
#include <linux/err.h>
@@ -112,7 +112,6 @@ static unsigned long i915_stolen_to_phys
*
*/
base = 0;
-#ifndef __NetBSD__ /* XXX i915 gem gsm stolen memory base */
if (INTEL_INFO(dev)->gen >= 3) {
/* Read Graphics Base of Stolen Memory directly */
pci_read_config_dword(dev->pdev, 0x5c, &base);
@@ -201,7 +200,6 @@ static unsigned long i915_stolen_to_phys
base = tom - tseg_size - dev_priv->gtt.stolen_size;
}
-#endif
if (base == 0)
return 0;
