[Intel-gfx] [PATCH 19/49] drm/i915/bxt: don't use unsupported port detection

[Jani Nikula]

On Tue, 17 Mar 2015, Imre Deak <imre.deak at intel.com> wrote:
> From: Vandana Kannan <vandana.kannan at intel.com>
>
> The port detection register flags in SFUSE_STRAP and DDI_BUF_CTL_A are
> not defined for BXT, so don't use them.
>
> Suggested by Satheesh.
>
> v2:
> - DDI_BUF_CTL_A bit 0 is not useful on BXT. Making changes to use this
>   bit when simulator or BXT is not applicable. Code re-arranged as per
>   Damien's suggestion.
>
> v3:
> - clarify commit message, add code comment (imre)
>
> Signed-off-by: Vandana Kannan <vandana.kannan at intel.com> (v2)
> Cc: M, Satheeshakrishna <satheeshakrishna.m at intel.com>
> Cc: Lespiau, Damien <damien.lespiau at intel.com>
> Cc: Shankar, Uma <uma.shankar at intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> ---
>  drivers/gpu/drm/i915/intel_display.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 90b460c..e54e948 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12615,7 +12615,16 @@ static void intel_setup_outputs(struct drm_device *dev)
>  	if (intel_crt_present(dev))
>  		intel_crt_init(dev);
>  
> -	if (HAS_DDI(dev)) {
> +	if (IS_BROXTON(dev)) {
> +		/*
> +		 * FIXME: Broxton doesn't support port detection via the
> +		 * DDI_BUF_CTL_A or SFUSE_STRAP registers, find another way to
> +		 * detect the ports.
> +		 */
> +		intel_ddi_init(dev, PORT_A);
> +		intel_ddi_init(dev, PORT_B);
> +		intel_ddi_init(dev, PORT_C);
> +	} else if (HAS_DDI(dev)) {
>  		int found;
>  
>  		/*
> -- 
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center