[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Unifdef the dmi hacks he...

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

details:   https://anonhg.NetBSD.org/src/rev/603ff7589e1a
branches:  trunk
changeset: 329372:603ff7589e1a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed May 21 14:03:42 2014 +0000

description:
Unifdef the dmi hacks here, now that we have dmi_check_system.

diffstat:

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

diffs (68 lines):

diff -r a82214d343cd -r 603ff7589e1a sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Wed May 21 14:01:30 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Wed May 21 14:03:42 2014 +0000
@@ -474,7 +474,6 @@
        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);
@@ -490,9 +489,8 @@
                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro8,2"),
                },
        },
-       { }     /* terminating entry */
+       { .callback = NULL }    /* terminating entry */
 };
-#endif
 
 static bool is_dual_link_lvds(struct drm_i915_private *dev_priv,
                              unsigned int reg)
@@ -503,10 +501,8 @@
        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;
@@ -8846,7 +8842,6 @@
        }
 }
 
-#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,7 +8905,7 @@
                                            DMI_MATCH(DMI_PRODUCT_NAME, ""),
                                },
                        },
-                       { }  /* terminating entry */
+                       { .callback = NULL }  /* terminating entry */
                },
                .hook = quirk_invert_brightness,
        },
@@ -8960,7 +8955,6 @@
                        intel_dmi_quirks[i].hook(dev);
        }
 }
-#endif
 
 /* Disable the VGA plane that we never use */
 static void i915_disable_vga(struct drm_device *dev)
@@ -9037,9 +9031,7 @@
 
        dev->mode_config.funcs = &intel_mode_funcs;
 
-#ifndef __NetBSD__             /* XXX dmi hack */
        intel_init_quirks(dev);
-#endif
 
        intel_init_pm(dev);