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

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

details:   https://anonhg.NetBSD.org/src/rev/c00565913616
branches:  riastradh-drm2
changeset: 788343:c00565913616
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:20:52 2013 +0000

description:
Omit Linux framebuffer stuff from i915_drv.c.

diffstat:

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

diffs (47 lines):

diff -r 38daa31e9db2 -r c00565913616 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Wed Jul 24 03:20:37 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Wed Jul 24 03:20:52 2013 +0000
@@ -508,9 +508,11 @@
        /* Modeset on resume, not lid events */
        dev_priv->modeset_on_lid = 0;
 
+#ifndef __NetBSD__             /* XXX fb */
        console_lock();
        intel_fbdev_set_suspend(dev, 1);
        console_unlock();
+#endif
 
        return 0;
 }
@@ -545,6 +547,7 @@
        return 0;
 }
 
+#ifndef __NetBSD__             /* XXX fb */
 void intel_console_resume(struct work_struct *work)
 {
        struct drm_i915_private *dev_priv =
@@ -556,6 +559,7 @@
        intel_fbdev_set_suspend(dev, 0);
        console_unlock();
 }
+#endif
 
 static int __i915_drm_thaw(struct drm_device *dev)
 {
@@ -584,6 +588,7 @@
 
        dev_priv->modeset_on_lid = 0;
 
+#ifndef __NetBSD__             /* XXX fb */
        /*
         * The console lock can be pretty contented on resume due
         * to all the printk activity.  Try to keep it out of the hot
@@ -595,6 +600,7 @@
        } else {
                schedule_work(&dev_priv->console_resume_work);
        }
+#endif
 
        return error;
 }