diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 157a68f48060..4ca2a3d885a0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -5045,7 +5045,6 @@ static void ironlake_init_pch_refclk(struct drm_device *dev) | |||
5045 | u32 val, final; | 5045 | u32 val, final; |
5046 | bool has_lvds = false; | 5046 | bool has_lvds = false; |
5047 | bool has_cpu_edp = false; | 5047 | bool has_cpu_edp = false; |
5048 | bool has_pch_edp = false; | ||
5049 | bool has_panel = false; | 5048 | bool has_panel = false; |
5050 | bool has_ck505 = false; | 5049 | bool has_ck505 = false; |
5051 | bool can_ssc = false; | 5050 | bool can_ssc = false; |
@@ -5060,9 +5059,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev) | |||
5060 | break; | 5059 | break; |
5061 | case INTEL_OUTPUT_EDP: | 5060 | case INTEL_OUTPUT_EDP: |
5062 | has_panel = true; | 5061 | has_panel = true; |
5063 | if (intel_encoder_is_pch_edp(&encoder->base)) | 5062 | if (enc_to_dig_port(&encoder->base)->port == PORT_A) |
5064 | has_pch_edp = true; | ||
5065 | else | ||
5066 | has_cpu_edp = true; | 5063 | has_cpu_edp = true; |
5067 | break; | 5064 | break; |
5068 | } | 5065 | } |
@@ -5076,9 +5073,8 @@ static void ironlake_init_pch_refclk(struct drm_device *dev) | |||
5076 | can_ssc = true; | 5073 | can_ssc = true; |
5077 | } | 5074 | } |
5078 | 5075 | ||
5079 | DRM_DEBUG_KMS("has_panel %d has_lvds %d has_pch_edp %d has_cpu_edp %d has_ck505 %d\n", | 5076 | DRM_DEBUG_KMS("has_panel %d has_lvds %d has_ck505 %d\n", |
5080 | has_panel, has_lvds, has_pch_edp, has_cpu_edp, | 5077 | has_panel, has_lvds, has_ck505); |
5081 | has_ck505); | ||
5082 | 5078 | ||
5083 | /* Ironlake: try to setup display ref clock before DPLL | 5079 | /* Ironlake: try to setup display ref clock before DPLL |
5084 | * enabling. This is only under driver's control after | 5080 | * enabling. This is only under driver's control after |