UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Imre Deak 2013-05-08 13:14:04 +03:00 committed by Daniel Vetter
parent d8e8b582b4
commit 2de6905f0a
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/intel_display.c
View File

@ -5045,7 +5045,6 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
u32 val, final; u32 val, final;
bool has_lvds = false; bool has_lvds = false;
bool has_cpu_edp = false; bool has_cpu_edp = false;
bool has_pch_edp = false;
bool has_panel = false; bool has_panel = false;
bool has_ck505 = false; bool has_ck505 = false;
bool can_ssc = false; bool can_ssc = false;
@ -5060,9 +5059,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
break; break;
case INTEL_OUTPUT_EDP: case INTEL_OUTPUT_EDP:
has_panel = true; has_panel = true;
if (intel_encoder_is_pch_edp(&encoder->base)) if (enc_to_dig_port(&encoder->base)->port == PORT_A)
has_pch_edp = true;
else
has_cpu_edp = true; has_cpu_edp = true;
break; break;
} }
@ -5076,9 +5073,8 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
can_ssc = true; can_ssc = true;
} }
DRM_DEBUG_KMS("has_panel %d has_lvds %d has_pch_edp %d has_cpu_edp %d has_ck505 %d\n", DRM_DEBUG_KMS("has_panel %d has_lvds %d has_ck505 %d\n",
has_panel, has_lvds, has_pch_edp, has_cpu_edp, has_panel, has_lvds, has_ck505);
has_ck505);
/* Ironlake: try to setup display ref clock before DPLL /* Ironlake: try to setup display ref clock before DPLL
* enabling. This is only under driver's control after * enabling. This is only under driver's control after