diff options
author | Dave Airlie <airlied@redhat.com> | 2009-08-19 23:38:04 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-08-19 23:38:04 -0400 |
commit | 51c8b4071d84d46cc100baa5931ad06b2a823c95 (patch) | |
tree | 098cf9d41ce1c548d922708a770a9efe35e434df /drivers/gpu/drm/i915/intel_lvds.c | |
parent | a987fcaa805fcb24ba885c2e29fd4fdb6816f08f (diff) | |
parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) |
Merge Linus master to drm-next
linux-next conflict reported needed resolution.
Conflicts:
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/ttm/ttm_bo.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 5df486fbe05..b78c550ae86 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
@@ -768,6 +768,14 @@ static const struct dmi_system_id intel_no_lvds[] = { | |||
768 | }, | 768 | }, |
769 | { | 769 | { |
770 | .callback = intel_no_lvds_dmi_callback, | 770 | .callback = intel_no_lvds_dmi_callback, |
771 | .ident = "AOpen Mini PC MP915", | ||
772 | .matches = { | ||
773 | DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"), | ||
774 | DMI_MATCH(DMI_BOARD_NAME, "i915GMx-F"), | ||
775 | }, | ||
776 | }, | ||
777 | { | ||
778 | .callback = intel_no_lvds_dmi_callback, | ||
771 | .ident = "Aopen i945GTt-VFA", | 779 | .ident = "Aopen i945GTt-VFA", |
772 | .matches = { | 780 | .matches = { |
773 | DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"), | 781 | DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"), |
@@ -872,6 +880,10 @@ void intel_lvds_init(struct drm_device *dev) | |||
872 | if (IS_IGDNG(dev)) { | 880 | if (IS_IGDNG(dev)) { |
873 | if ((I915_READ(PCH_LVDS) & LVDS_DETECTED) == 0) | 881 | if ((I915_READ(PCH_LVDS) & LVDS_DETECTED) == 0) |
874 | return; | 882 | return; |
883 | if (dev_priv->edp_support) { | ||
884 | DRM_DEBUG("disable LVDS for eDP support\n"); | ||
885 | return; | ||
886 | } | ||
875 | gpio = PCH_GPIOC; | 887 | gpio = PCH_GPIOC; |
876 | } | 888 | } |
877 | 889 | ||