Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:41:32 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: intel_lvds.c
Log Message:
Provisionally ifdef out dmi hacks in intel_lvds.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.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_lvds.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.1.1.1.2.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.1.1.1.2.3 Wed Jul 24 03:41:17 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c Wed Jul 24 03:41:32 2013
@@ -473,6 +473,7 @@ static int intel_lvds_get_modes(struct d
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 @@ static const struct dmi_system_id intel_
{ } /* terminating entry */
};
+#endif
/*
* Lid events. Note the use of 'modeset_on_lid':
@@ -520,9 +522,11 @@ static int intel_lid_notify(struct notif
*/
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 @@ static const struct drm_encoder_funcs in
.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 @@ static const struct dmi_system_id intel_
{ } /* terminating entry */
};
+#endif
/**
* intel_find_lvds_downclock - find the reduced downclock for LVDS in EDID
@@ -936,9 +942,11 @@ bool intel_lvds_init(struct drm_device *
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)) {
