Module Name: src
Committed By: riastradh
Date: Wed May 21 15:40:52 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_crt.c intel_lvds.c
Log Message:
Unifdef the dmi hacks here too, now that we have dmi_check_system.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c \
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_crt.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c Wed May 21 15:40:52 2014
@@ -706,7 +706,6 @@ static const struct drm_encoder_funcs in
.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);
@@ -722,9 +721,8 @@ static const struct dmi_system_id intel_
DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
},
},
- { }
+ { .callback = NULL }
};
-#endif
void intel_crt_init(struct drm_device *dev)
{
@@ -733,11 +731,9 @@ void intel_crt_init(struct drm_device *d
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)
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.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c Wed May 21 15:40:52 2014
@@ -473,7 +473,6 @@ 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);
@@ -491,9 +490,8 @@ static const struct dmi_system_id intel_
},
},
- { } /* terminating entry */
+ { .callback = NULL } /* terminating entry */
};
-#endif
/*
* Lid events. Note the use of 'modeset_on_lid':
@@ -522,11 +520,9 @@ 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;
@@ -629,7 +625,6 @@ 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);
@@ -798,9 +793,8 @@ static const struct dmi_system_id intel_
},
},
- { } /* terminating entry */
+ { .callback = NULL } /* terminating entry */
};
-#endif
/**
* intel_find_lvds_downclock - find the reduced downclock for LVDS in EDID
@@ -942,11 +936,9 @@ 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)) {
