From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 12 May 2011 21:17:14 +0000 (+0100)
Subject: drm/i915: Replace ironlake_compute_wm0 with g4x_compute_wm0
X-Git-Tag: v3.0-rc3~41^2~1^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f405100f2b39be7759eea3f4cf910869727429c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed