51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
https://bugzilla.redhat.com/show_bug.cgi?id=639146
|
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
|
|
index ce8ff0e..3bbd2c4 100644
|
|
--- a/drivers/gpu/drm/i915/i915_dma.c
|
|
+++ b/drivers/gpu/drm/i915/i915_dma.c
|
|
@@ -1353,6 +1353,27 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
|
|
return can_switch;
|
|
}
|
|
|
|
+/* check the VBT to see whether the eDP is on DP-D port */
|
|
+static bool intel_dpd_is_edp(struct drm_device *dev)
|
|
+{
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
+ struct child_device_config *p_child;
|
|
+ int i;
|
|
+
|
|
+ if (!dev_priv->child_dev_num)
|
|
+ return false;
|
|
+
|
|
+ for (i = 0; i < dev_priv->child_dev_num; i++) {
|
|
+ p_child = dev_priv->child_dev + i;
|
|
+
|
|
+ if (p_child->dvo_port == PORT_IDPD &&
|
|
+ p_child->device_type == DEVICE_TYPE_eDP)
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+}
|
|
+
|
|
static int i915_load_modeset_init(struct drm_device *dev,
|
|
unsigned long prealloc_start,
|
|
unsigned long prealloc_size,
|
|
@@ -1409,6 +1430,15 @@ static int i915_load_modeset_init(struct drm_device *dev,
|
|
if (ret)
|
|
DRM_INFO("failed to find VBIOS tables\n");
|
|
|
|
+ /* XXX: eDP doesn't even work in git HEAD,
|
|
+ * bail out and pray that text mode still works...
|
|
+ */
|
|
+ if (intel_dpd_is_edp(dev)) {
|
|
+ DRM_ERROR("eDP support is currently non-functional, please boot with \"nomodeset xdriver=vesa\"\n");
|
|
+ ret = -EINVAL;
|
|
+ goto cleanup_ringbuffer;
|
|
+ }
|
|
+
|
|
/* if we have > 1 VGA cards, then disable the radeon VGA resources */
|
|
ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);
|
|
if (ret)
|