[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Ifdef out more graphics ...

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

details:   https://anonhg.NetBSD.org/src/rev/9c19d4ada4f6
branches:  trunk
changeset: 365915:9c19d4ada4f6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:16:00 2018 +0000

description:
Ifdef out more graphics stolen memory stuff for now.

diffstat:

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

diffs (50 lines):

diff -r cda2552dcbaa -r 9c19d4ada4f6 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:15:50 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c     Mon Aug 27 07:16:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_stolen.c,v 1.7 2018/08/27 06:08:38 riastradh Exp $    */
+/*     $NetBSD: i915_gem_stolen.c,v 1.8 2018/08/27 07:16:00 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.7 2018/08/27 06:08:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_stolen.c,v 1.8 2018/08/27 07:16:00 riastradh Exp $");
 
 #include <linux/printk.h>
 #include <linux/err.h>
@@ -94,8 +94,8 @@
 
 static unsigned long i915_stolen_to_physical(struct drm_device *dev)
 {
+       struct drm_i915_private *dev_priv = dev->dev_private;
 #ifndef __NetBSD__
-       struct drm_i915_private *dev_priv = dev->dev_private;
        struct resource *r;
 #endif
        u32 base;
@@ -112,12 +112,11 @@
         *
         */
        base = 0;
+#ifndef __NetBSD__             /* XXX i915 gem gsm stolen memory base */
        if (INTEL_INFO(dev)->gen >= 3) {
-#ifndef __NetBSD__             /* XXX disable this for now */
                /* Read Graphics Base of Stolen Memory directly */
                pci_read_config_dword(dev->pdev, 0x5c, &base);
                base &= ~((1<<20) - 1);
-#endif
        } else if (IS_I865G(dev)) {
                u32 tseg_size = 0;
                u16 toud = 0;
@@ -202,6 +201,7 @@
 
                base = tom - tseg_size - dev_priv->gtt.stolen_size;
        }
+#endif
 
        if (base == 0)
                return 0;