aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_runtime_pm.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-04-10 11:21:29 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-05-08 09:56:42 -0400
commit71849b67e788ca8899982df7adf21f61f44cb474 (patch)
tree323a1fbb411b32ac8a09ef64c24a898cf0e738ed /drivers/gpu/drm/i915/intel_runtime_pm.c
parent70722468872b0752abaff54d34ed16af0d95cb9f (diff)
Revert "drm/i915: Hack to tie both common lanes together on chv"
With recent hardware/firmware there don't appear to be any glitches on the other PHY when we toggle the cmnreset for the other PHY. So detangle the cmnlane power wells from one another and let them be controlled independently. This reverts commit 3dd7b97458e8aa2d8985b46622d226fa635071e7. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_runtime_pm.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 3d7352577bdc..317b9b43d1c1 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -1464,23 +1464,13 @@ static struct i915_power_well chv_power_wells[] = {
1464#endif 1464#endif
1465 { 1465 {
1466 .name = "dpio-common-bc", 1466 .name = "dpio-common-bc",
1467 /* 1467 .domains = CHV_DPIO_CMN_BC_POWER_DOMAINS,
1468 * XXX: cmnreset for one PHY seems to disturb the other.
1469 * As a workaround keep both powered on at the same
1470 * time for now.
1471 */
1472 .domains = CHV_DPIO_CMN_BC_POWER_DOMAINS | CHV_DPIO_CMN_D_POWER_DOMAINS,
1473 .data = PUNIT_POWER_WELL_DPIO_CMN_BC, 1468 .data = PUNIT_POWER_WELL_DPIO_CMN_BC,
1474 .ops = &chv_dpio_cmn_power_well_ops, 1469 .ops = &chv_dpio_cmn_power_well_ops,
1475 }, 1470 },
1476 { 1471 {
1477 .name = "dpio-common-d", 1472 .name = "dpio-common-d",
1478 /* 1473 .domains = CHV_DPIO_CMN_D_POWER_DOMAINS,
1479 * XXX: cmnreset for one PHY seems to disturb the other.
1480 * As a workaround keep both powered on at the same
1481 * time for now.
1482 */
1483 .domains = CHV_DPIO_CMN_BC_POWER_DOMAINS | CHV_DPIO_CMN_D_POWER_DOMAINS,
1484 .data = PUNIT_POWER_WELL_DPIO_CMN_D, 1474 .data = PUNIT_POWER_WELL_DPIO_CMN_D,
1485 .ops = &chv_dpio_cmn_power_well_ops, 1475 .ops = &chv_dpio_cmn_power_well_ops,
1486 }, 1476 },