[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Ifdef out Linux...

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

details:   https://anonhg.NetBSD.org/src/rev/bdba65a3a43c
branches:  riastradh-drm2
changeset: 788288:bdba65a3a43c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:05:07 2013 +0000

description:
Ifdef out Linux vga stuff from i915_dma.c.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c |  12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diffs (77 lines):

diff -r 4e01bf924736 -r bdba65a3a43c sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Wed Jul 24 03:04:50 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Wed Jul 24 03:05:07 2013 +0000
@@ -1217,6 +1217,7 @@
                release_resource(&dev_priv->mch_res);
 }
 
+#ifndef __NetBSD__  /* XXX vga */
 /* true = enable decode, false = disable decoder */
 static unsigned int i915_vga_set_decode(void *cookie, bool state)
 {
@@ -1265,6 +1266,7 @@
        .reprobe = NULL,
        .can_switch = i915_switcheroo_can_switch,
 };
+#endif
 
 static int i915_load_modeset_init(struct drm_device *dev)
 {
@@ -1275,6 +1277,7 @@
        if (ret)
                DRM_INFO("failed to find VBIOS tables\n");
 
+#ifndef __NetBSD__             /* XXX vga */
        /* If we have > 1 VGA cards, then we need to arbitrate access
         * to the common VGA resources.
         *
@@ -1285,12 +1288,15 @@
        ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);
        if (ret && ret != -ENODEV)
                goto out;
+#endif
 
        intel_register_dsm_handler();
 
+#ifndef __NetBSD__             /* XXX vga */
        ret = vga_switcheroo_register_client(dev->pdev, &i915_switcheroo_ops);
        if (ret)
                goto cleanup_vga_client;
+#endif
 
        /* Initialise stolen first so that we may reserve preallocated
         * objects for the BIOS to KMS transition.
@@ -1342,10 +1348,12 @@
 cleanup_gem_stolen:
        i915_gem_cleanup_stolen(dev);
 cleanup_vga_switcheroo:
+#ifndef __NetBSD__             /* XXX vga */
        vga_switcheroo_unregister_client(dev->pdev);
 cleanup_vga_client:
        vga_client_register(dev->pdev, NULL, NULL, NULL);
 out:
+#endif
        return ret;
 }
 
@@ -1734,8 +1742,10 @@
                        dev_priv->child_dev_num = 0;
                }
 
+#ifndef __NetBSD__             /* XXX vga */
                vga_switcheroo_unregister_client(dev->pdev);
                vga_client_register(dev->pdev, NULL, NULL, NULL);
+#endif
        }
 
        /* Free error state after interrupts are fully disabled. */
@@ -1829,7 +1839,9 @@
 
        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                intel_fb_restore_mode(dev);
+#ifndef __NetBSD__             /* XXX vga */
                vga_switcheroo_process_delayed_switch();
+#endif
                return;
        }