[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Provisionally i...

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

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

description:
Provisionally ifdef out dmi hacks in intel_lvds.c.

diffstat:

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

diffs (59 lines):

diff -r ed6ebf1621d8 -r 70de7448c8c9 sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c  Wed Jul 24 03:41:17 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c  Wed Jul 24 03:41:32 2013 +0000
@@ -473,6 +473,7 @@
        return 1;
 }
 
+#ifndef __NetBSD__             /* XXX dmi hack */
 static int intel_no_modeset_on_lid_dmi_callback(const struct dmi_system_id *id)
 {
        DRM_INFO("Skipping forced modeset for %s\n", id->ident);
@@ -492,6 +493,7 @@
 
        { }     /* terminating entry */
 };
+#endif
 
 /*
  * Lid events. Note the use of 'modeset_on_lid':
@@ -520,9 +522,11 @@
         */
        connector->status = connector->funcs->detect(connector, false);
 
+#ifndef __NetBSD__             /* XXX dmi hack */
        /* Don't force modeset on machines where it causes a GPU lockup */
        if (dmi_check_system(intel_no_modeset_on_lid))
                return NOTIFY_OK;
+#endif
        if (!acpi_lid_open()) {
                dev_priv->modeset_on_lid = 1;
                return NOTIFY_OK;
@@ -625,6 +629,7 @@
        .destroy = intel_encoder_destroy,
 };
 
+#ifndef __NetBSD__             /* XXX dmi hack */
 static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
 {
        DRM_INFO("Skipping LVDS initialization for %s\n", id->ident);
@@ -795,6 +800,7 @@
 
        { }     /* terminating entry */
 };
+#endif
 
 /**
  * intel_find_lvds_downclock - find the reduced downclock for LVDS in EDID
@@ -936,9 +942,11 @@
        if (!intel_lvds_supported(dev))
                return false;
 
+#ifndef __NetBSD__             /* XXX dmi hack */
        /* Skip init on machines we know falsely report LVDS */
        if (dmi_check_system(intel_no_lvds))
                return false;
+#endif
 
        pin = GMBUS_PORT_PANEL;
        if (!lvds_is_present_in_vbt(dev, &pin)) {