drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 12 May 2011 21:17:14 +0000 (22:17 +0100)
committerKeith Packard <keithp@keithp.com>
Sat, 4 Jun 2011 17:40:59 +0000 (10:40 -0700)
commit9f405100f2b39be7759eea3f4cf910869727429c
treefe683a1dc25690781653109d3ac29c5a855815de
parentbf3301abba31ee71ed8dc87f18fcaebd27dc3b3e
drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0

The computation of the first-level watermarks for g4x and gen5+ are
based on the same algorithm, so we can refactor those code paths to
use a single function.

Note that g4x_compute_wm0 takes a 'plane' argument while
ironlake_compute_wm0 took a 'pipe' argument. Both should have used a
'plane' argument, so this patch fixes that as well (not that it caused
a problem; ironlake always uses pipe == plane).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
drivers/gpu/drm/i915/intel_display.c