[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/97b368d04eae
branches:  riastradh-drm2
changeset: 788390:97b368d04eae
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:34:36 2013 +0000

description:
Ifdef out dmi hack in intel_crt.c.

diffstat:

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

diffs (31 lines):

diff -r a39d310525c7 -r 97b368d04eae sys/external/bsd/drm2/dist/drm/i915/intel_crt.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c   Wed Jul 24 03:34:21 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c   Wed Jul 24 03:34:36 2013 +0000
@@ -706,6 +706,7 @@
        .destroy = intel_encoder_destroy,
 };
 
+#ifndef __NetBSD__             /* XXX dmi hack */
 static int __init intel_no_crt_dmi_callback(const struct dmi_system_id *id)
 {
        DRM_INFO("Skipping CRT initialization for %s\n", id->ident);
@@ -723,6 +724,7 @@
        },
        { }
 };
+#endif
 
 void intel_crt_init(struct drm_device *dev)
 {
@@ -731,9 +733,11 @@
        struct intel_connector *intel_connector;
        struct drm_i915_private *dev_priv = dev->dev_private;
 
+#ifndef __NetBSD__             /* XXX dmi hack */
        /* Skip machines without VGA that falsely report hotplug events */
        if (dmi_check_system(intel_no_crt))
                return;
+#endif
 
        crt = kzalloc(sizeof(struct intel_crt), GFP_KERNEL);
        if (!crt)