提交 c0efc387 编写于 作者: D Daniel Vetter

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: NPaulo Zanoni <przanoni@gmail.com>
Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 ee9300bb
...@@ -515,8 +515,7 @@ i9xx_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, ...@@ -515,8 +515,7 @@ i9xx_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,
clock.m1++) { clock.m1++) {
for (clock.m2 = limit->m2.min; for (clock.m2 = limit->m2.min;
clock.m2 <= limit->m2.max; clock.m2++) { clock.m2 <= limit->m2.max; clock.m2++) {
/* m1 is always 0 in Pineview */ if (clock.m2 >= clock.m1)
if (clock.m2 >= clock.m1 && !IS_PINEVIEW(dev))
break; break;
for (clock.n = limit->n.min; for (clock.n = limit->n.min;
clock.n <= limit->n.max; clock.n++) { clock.n <= limit->n.max; clock.n++) {
...@@ -577,9 +576,6 @@ pnv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, ...@@ -577,9 +576,6 @@ pnv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc,
clock.m1++) { clock.m1++) {
for (clock.m2 = limit->m2.min; for (clock.m2 = limit->m2.min;
clock.m2 <= limit->m2.max; clock.m2++) { 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; for (clock.n = limit->n.min;
clock.n <= limit->n.max; clock.n++) { clock.n <= limit->n.max; clock.n++) {
for (clock.p1 = limit->p1.min; for (clock.p1 = limit->p1.min;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册