[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Re-enable i915 GSM now t...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/89466a1f33a4
branches:  trunk
changeset: 992640:89466a1f33a4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:20:39 2018 +0000

description:
Re-enable i915 GSM now that pci_bus_config_read/write_* is here.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 5991c00a3fc4 -r 89466a1f33a4 sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c     Mon Aug 27 07:20:25 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c     Mon Aug 27 07:20:39 2018 +0000
@@ -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 @@
         *
         */
        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 @@
 
                base = tom - tseg_size - dev_priv->gtt.stolen_size;
        }
-#endif
 
        if (base == 0)
                return 0;