Module Name: src
Committed By: riastradh
Date: Wed May 21 14:03:42 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
Log Message:
Unifdef the dmi hacks here, now that we have dmi_check_system.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.4 Sat Apr 26 20:26:26 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Wed May 21 14:03:42 2014
@@ -474,7 +474,6 @@ static void vlv_init_dpio(struct drm_dev
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 @@ static const struct dmi_system_id intel_
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 @@ static bool is_dual_link_lvds(struct drm
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 @@ static void intel_init_display(struct dr
}
}
-#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 @@ static const struct intel_dmi_quirk inte
DMI_MATCH(DMI_PRODUCT_NAME, ""),
},
},
- { } /* terminating entry */
+ { .callback = NULL } /* terminating entry */
},
.hook = quirk_invert_brightness,
},
@@ -8960,7 +8955,6 @@ static void intel_init_quirks(struct drm
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 @@ void intel_modeset_init(struct drm_devic
dev->mode_config.funcs = &intel_mode_funcs;
-#ifndef __NetBSD__ /* XXX dmi hack */
intel_init_quirks(dev);
-#endif
intel_init_pm(dev);
