| From 78f768ff627c426dc0f4475fc751baf79d01d8bf Mon Sep 17 00:00:00 2001 |
| From: Imre Deak <imre.deak@intel.com> |
| Date: Wed, 8 May 2013 13:14:04 +0300 |
| Subject: drm/i915: ilk-ivb: replace !is_pch_edp() with port==PORT_A |
| |
| On ILK-IVB the CPU side eDP is always on port-A. |
| |
| Also reduce somewhat the debug verbosity. |
| |
| v2: |
| - reduce debug verbosity |
| |
| Signed-off-by: Imre Deak <imre.deak@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 2de6905f0a30c8fbe293e1e3ecdb766bbf5f7760) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 10 +++------- |
| 1 file changed, 3 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index ee297a878aa5..b93b2407ab57 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -5057,7 +5057,6 @@ static void ironlake_init_pch_refclk(struct drm_device *dev) |
| u32 val, final; |
| bool has_lvds = false; |
| bool has_cpu_edp = false; |
| - bool has_pch_edp = false; |
| bool has_panel = false; |
| bool has_ck505 = false; |
| bool can_ssc = false; |
| @@ -5072,9 +5071,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev) |
| break; |
| case INTEL_OUTPUT_EDP: |
| has_panel = true; |
| - if (intel_encoder_is_pch_edp(&encoder->base)) |
| - has_pch_edp = true; |
| - else |
| + if (enc_to_dig_port(&encoder->base)->port == PORT_A) |
| has_cpu_edp = true; |
| break; |
| } |
| @@ -5088,9 +5085,8 @@ static void ironlake_init_pch_refclk(struct drm_device *dev) |
| can_ssc = true; |
| } |
| |
| - DRM_DEBUG_KMS("has_panel %d has_lvds %d has_pch_edp %d has_cpu_edp %d has_ck505 %d\n", |
| - has_panel, has_lvds, has_pch_edp, has_cpu_edp, |
| - has_ck505); |
| + DRM_DEBUG_KMS("has_panel %d has_lvds %d has_ck505 %d\n", |
| + has_panel, has_lvds, has_ck505); |
| |
| /* Ironlake: try to setup display ref clock before DPLL |
| * enabling. This is only under driver's control after |
| -- |
| 1.8.5.rc3 |
| |
