[Intel-gfx] [PATCH] drm/i915: add the missing clone mask for display port on IGDNG

yakui.zhao at intel.com yakui.zhao at intel.com
Tue Dec 1 06:06:40 CET 2009


From: Zhao Yakui <yakui.zhao at intel.com>

Add the missing clone mask for display port on IGDNG.

At the same time it also fix the error condition judgement in the function of
dp_is_present_in_vbt.

Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a86af0d..7deadcc 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1247,11 +1247,11 @@ int dp_is_present_in_vbt(struct drm_device *dev, int dp_reg)
 		return 1;
 
 	dp_port = 0;
-	if (dp_reg == DP_B || PCH_DP_B)
+	if (dp_reg == DP_B || dp_reg == PCH_DP_B)
 		dp_port = PORT_IDPB;
-	else if (dp_reg == DP_C || PCH_DP_C)
+	else if (dp_reg == DP_C || dp_reg == PCH_DP_C)
 		dp_port = PORT_IDPC;
-	else if (dp_reg == DP_D || PCH_DP_D)
+	else if (dp_reg == DP_D || dp_reg == PCH_DP_D)
 		dp_port = PORT_IDPD;
 
 	ret = 0;
@@ -1306,11 +1306,11 @@ intel_dp_init(struct drm_device *dev, int output_reg)
 	else
 		intel_output->type = INTEL_OUTPUT_DISPLAYPORT;
 
-	if (output_reg == DP_B)
+	if (output_reg == DP_B || output_reg == PCH_DP_B)
 		intel_output->clone_mask = (1 << INTEL_DP_B_CLONE_BIT);
-	else if (output_reg == DP_C)
+	else if (output_reg == DP_C || output_reg == PCH_DP_C)
 		intel_output->clone_mask = (1 << INTEL_DP_C_CLONE_BIT);
-	else if (output_reg == DP_D)
+	else if (output_reg == DP_D || output_reg == PCH_DP_B)
 		intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT);
 
 	if (IS_eDP(intel_output)) {
-- 
1.5.4.5




More information about the Intel-gfx mailing list