aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-04-30 08:01:42 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-05-10 15:56:43 -0400
commitb4c09f3bbda97ec685afd604d8a3a08c72465910 (patch)
treef174ed656e6bf0a5946b0a4ac80765477df971f8
parent70484559296623d49e559a3a10fa32fd2bc5dcc3 (diff)
drm/i915: drop TVclock special casing on ilk+
TV-out uses the same reference clock as everyone else. The only difference seems to be in the slightly different CB tuning limit. Note that PLL_REF_INPUT_TVCLKINBC is a reserved value on ilk+. Also strictly speaking we don't support native TV-out on ilk+, hence all that code is dead. But Bspec still contains some residual mentions of native TV-out on some pch-split platforms, so I've figured it doesn't hurt to keep the code around a bit longer (e.g. in the cb tune function). v2: Improve the commit message as Jani suggested in his review. Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9365c5aa16bb..5fcd5b09ff56 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5637,9 +5637,6 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,
5637 if (intel_encoder->needs_tv_clock) 5637 if (intel_encoder->needs_tv_clock)
5638 is_tv = true; 5638 is_tv = true;
5639 break; 5639 break;
5640 case INTEL_OUTPUT_TVOUT:
5641 is_tv = true;
5642 break;
5643 } 5640 }
5644 5641
5645 num_connectors++; 5642 num_connectors++;
@@ -5698,13 +5695,7 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,
5698 break; 5695 break;
5699 } 5696 }
5700 5697
5701 if (is_sdvo && is_tv) 5698 if (is_lvds && intel_panel_use_ssc(dev_priv) && num_connectors < 2)
5702 dpll |= PLL_REF_INPUT_TVCLKINBC;
5703 else if (is_tv)
5704 /* XXX: just matching BIOS for now */
5705 /* dpll |= PLL_REF_INPUT_TVCLKINBC; */
5706 dpll |= 3;
5707 else if (is_lvds && intel_panel_use_ssc(dev_priv) && num_connectors < 2)
5708 dpll |= PLLB_REF_INPUT_SPREADSPECTRUMIN; 5699 dpll |= PLLB_REF_INPUT_SPREADSPECTRUMIN;
5709 else 5700 else
5710 dpll |= PLL_REF_INPUT_DREFCLK; 5701 dpll |= PLL_REF_INPUT_DREFCLK;