[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Disable dmi hac...

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

details:   https://anonhg.NetBSD.org/src/rev/afd3a92ce945
branches:  riastradh-drm2
changeset: 788382:afd3a92ce945
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:32:02 2013 +0000

description:
Disable dmi hacks in i915/intel_bios.c for now.

diffstat:

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

diffs (35 lines):

diff -r 98f46b3feb9f -r afd3a92ce945 sys/external/bsd/drm2/dist/drm/i915/intel_bios.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c  Wed Jul 24 03:31:45 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c  Wed Jul 24 03:32:02 2013 +0000
@@ -662,6 +662,7 @@
        DRM_DEBUG_KMS("Set default to SSC at %dMHz\n", dev_priv->lvds_ssc_freq);
 }
 
+#ifndef __NetBSD__             /* XXX dmi hack */
 static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
 {
        DRM_DEBUG_KMS("Falling back to manually reading VBT from "
@@ -681,6 +682,7 @@
        },
        { }
 };
+#endif
 
 /**
  * intel_parse_bios - find VBT and initialize settings from the BIOS
@@ -701,6 +703,7 @@
 
        init_vbt_defaults(dev_priv);
 
+#ifndef __NetBSD__             /* XXX dmi hack */
        /* XXX Should this validation be moved to intel_opregion.c? */
        if (!dmi_check_system(intel_no_opregion_vbt) && dev_priv->opregion.vbt) {
                struct vbt_header *vbt = dev_priv->opregion.vbt;
@@ -711,6 +714,7 @@
                } else
                        dev_priv->opregion.vbt = NULL;
        }
+#endif
 
        if (bdb == NULL) {
                struct vbt_header *vbt = NULL;