From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 12 Jan 2010 17:49:43 +0000 (+0100)
Subject: drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.
X-Git-Tag: v2.6.33-rc7~46^2~12
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db78e27de7e29a6db6be7caf607cf803d84094aa;p=pandora-kernel.git

drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.

Fixes errors like:
> reserve_ram_pages_type failed 0x15b7a000-0x15b7b000, track 0x8, req 0x10
when a BO is moved between WC and UC areas.

Reported-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

Reading git-diff-tree failed