[Intel-gfx] [PATCH 2/2] drm/i915: fold in IS_PNV checks from the split up find_dpll functions

[Paulo Zanoni]

2013/6/3 Daniel Vetter <daniel.vetter at ffwll.ch>:
> Since I stand by my rule that splitting functions should only do an
> exact copy, this is a follow-up patch.
>
> Suggested-by: Paulo Zanoni <przanoni at gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 874441e..a1f17d7 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -515,8 +515,7 @@ i9xx_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,
>              clock.m1++) {
>                 for (clock.m2 = limit->m2.min;
>                      clock.m2 <= limit->m2.max; clock.m2++) {
> -                       /* m1 is always 0 in Pineview */
> -                       if (clock.m2 >= clock.m1 && !IS_PINEVIEW(dev))
> +                       if (clock.m2 >= clock.m1)
>                                 break;
>                         for (clock.n = limit->n.min;
>                              clock.n <= limit->n.max; clock.n++) {
> @@ -577,9 +576,6 @@ pnv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,
>              clock.m1++) {
>                 for (clock.m2 = limit->m2.min;
>                      clock.m2 <= limit->m2.max; clock.m2++) {
> -                       /* m1 is always 0 in Pineview */
> -                       if (clock.m2 >= clock.m1 && !IS_PINEVIEW(dev))
> -                               break;
>                         for (clock.n = limit->n.min;
>                              clock.n <= limit->n.max; clock.n++) {
>                                 for (clock.p1 = limit->p1.min;
> --
> 1.7.11.7
>



-- 
Paulo Zanoni