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

[Zhenyu Wang]

On 2009.12.01 13:06:40 +0800, yakui.zhao at intel.com wrote:
> From: Zhao Yakui <yakui.zhao at intel.com>
> 
> Add the missing clone mask for display port on IGDNG.

Good with me on this part, except a typo...

> 
> 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)

						     PCH_DP_D?

>  		intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT);
>  
>  	if (IS_eDP(intel_output)) {
> -- 
> 1.5.4.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20091201/795dfcd4/attachment.sig>