aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-11-03 00:07:35 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-08 12:09:53 -0500
commit018f52c9c3c40b5ba22586b6ced6c3f5339848d6 (patch)
treefcecf866a9728810b40bb2fb6d514faecdebf445
parent6745a2ceaac6d4dd3ddac460dc149275b0ae7fc0 (diff)
drm/i915/bdw: pretend we have LPT LP on Broadwell
The platforms we currently have all have LPT LP on them. As such, we have no way to identify the new WPT PCH that will ship with Broadwell. NOTE: For all purposes relevant to the driver that this point, LPT and WPT are equivalent. Therefore there should be no need to actually change this for some time. v2: Don't assign dev_priv->num_pch_pll any more. v3: Rebase on top of the PCH detection changes for virtualized enviroments. v4: Wrote commit message Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> (v1) Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (v3) Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c0ab5d460692..a78e7798ec6b 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -453,6 +453,12 @@ void intel_detect_pch(struct drm_device *dev)
453 DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); 453 DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
454 WARN_ON(!IS_HASWELL(dev)); 454 WARN_ON(!IS_HASWELL(dev));
455 WARN_ON(!IS_ULT(dev)); 455 WARN_ON(!IS_ULT(dev));
456 } else if (IS_BROADWELL(dev)) {
457 dev_priv->pch_type = PCH_LPT;
458 dev_priv->pch_id =
459 INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
460 DRM_DEBUG_KMS("This is Broadwell, assuming "
461 "LynxPoint LP PCH\n");
456 } else { 462 } else {
457 goto check_next; 463 goto check_next;
458 } 464 }