[Intel-gfx] [PATCH 02/13] drm/i915/skl: Make sure to break when not finding suitable PLL dividers

Daniel Vetter daniel at ffwll.ch
Thu May 28 00:45:00 PDT 2015


On Thu, May 07, 2015 at 06:38:38PM +0100, Damien Lespiau wrote:
> Right now, when finishing the cycle with odd dividers without finding a
> suitable candidate, we end up in an infinite loop. Make sure to break in
> that case.
> 
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 2e24fa4..da7aa0f 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1180,6 +1180,10 @@ found:
>  		}
>  
>  		if (min_dco_index > 2 && dco_count == 2) {
> +                        /* oh well, we tried... */
> +                        if (retry_with_odd)
> +                                break;

Shouldn't we have a return value somewhere here and then indicate to
userspace that things seriously went wrong? The error code handling is
almost there already to pass it all back up to haswell_crtc_compute_clock.
-Daniel

> +
>  			retry_with_odd = true;
>  			dco_count = 0;
>  		}
> -- 
> 2.1.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list