diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 11 |
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; |
