diff options
| author | Daniel Vetter | 2013-06-03 20:56:24 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-06-04 13:56:52 +0200 |
| commit | c0efc387a8893470c1744e775e214c069bd2465e (patch) | |
| tree | 7f2a511576f0b0eb5e8c03e80f7cf03e94ba5a16 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: move find_pll callback to dev_priv->display (diff) | |
| download | kernel-qcow2-linux-c0efc387a8893470c1744e775e214c069bd2465e.tar.gz kernel-qcow2-linux-c0efc387a8893470c1744e775e214c069bd2465e.tar.xz kernel-qcow2-linux-c0efc387a8893470c1744e775e214c069bd2465e.zip | |
drm/i915: fold in IS_PNV checks from the split up find_dpll functions
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@gmail.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 537b8a44107d..ed6addf74275 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; |