From: Adam Jackson <ajax@redhat.com>
Date: Fri, 16 Apr 2010 22:20:57 +0000 (-0400)
Subject: drm/i915: Attempt to fix watermark setup on 85x (v2)
X-Git-Tag: v2.6.34-rc6~62^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f4695ed1c9e068772bcce4cd4ff03f88d57a008;p=pandora-kernel.git

drm/i915: Attempt to fix watermark setup on 85x (v2)

IS_MOBILE() catches 85x, so we'd always try to use the 9xx FIFO sizing;
since there's an explicit 85x version, this seems wrong.

v2: Handle 830m correctly too.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
---

Reading git-diff-tree failed