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

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

details:   https://anonhg.NetBSD.org/src/rev/75c8a297848e
branches:  riastradh-drm2
changeset: 788392:75c8a297848e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:35:19 2013 +0000

description:
Ifdef out dmi hacks in i915 intel_display.c.

diffstat:

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

diffs (56 lines):

diff -r 3ca4048c32d6 -r 75c8a297848e sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Wed Jul 24 03:34:58 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Wed Jul 24 03:35:19 2013 +0000
@@ -472,6 +472,7 @@
        POSTING_READ(DPIO_CTL);
 }
 
+#ifndef __NetBSD__             /* XXX dmi hack */
 static int intel_dual_link_lvds_callback(const struct dmi_system_id *id)
 {
        DRM_INFO("Forcing lvds to dual link mode on %s\n", id->ident);
@@ -489,6 +490,7 @@
        },
        { }     /* terminating entry */
 };
+#endif
 
 static bool is_dual_link_lvds(struct drm_i915_private *dev_priv,
                              unsigned int reg)
@@ -499,8 +501,10 @@
        if (i915_lvds_channel_mode > 0)
                return i915_lvds_channel_mode == 2;
 
+#ifndef __NetBSD__             /* XXX dmi hack */
        if (dmi_check_system(intel_dual_link_lvds))
                return true;
+#endif
 
        if (dev_priv->lvds_val)
                val = dev_priv->lvds_val;
@@ -8797,6 +8801,7 @@
        }
 }
 
+#ifndef __NetBSD__             /* XXX dmi hack */
 /*
  * Some BIOSes insist on assuming the GPU's pipe A is enabled at suspend,
  * resume, or other times.  This quirk makes sure that's the case for
@@ -8910,6 +8915,7 @@
                        intel_dmi_quirks[i].hook(dev);
        }
 }
+#endif
 
 /* Disable the VGA plane that we never use */
 static void i915_disable_vga(struct drm_device *dev)
@@ -8965,7 +8971,9 @@
 
        dev->mode_config.funcs = &intel_mode_funcs;
 
+#ifndef __NetBSD__             /* XXX dmi hack */
        intel_init_quirks(dev);
+#endif
 
        intel_init_pm(dev);