[PATCH] agp/amd-k7: Allow binding user memory to the AGP GART.

[Francisco Jerez]

TTM-based DRM drivers need to be able to bind user memory to the AGP
aperture. This patch fixes the "[TTM] AGP Bind memory failed." errors
and the subsequent fallout seen with the nouveau driver.

Reported-by: Grzesiek Sójka <pld at pfu.pl>
Signed-off-by: Francisco Jerez <currojerez at riseup.net>
---
 drivers/char/agp/amd-k7-agp.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index b6b1568..82e5189 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -303,13 +303,15 @@ static void amd_irongate_tlbflush(struct agp_memory *temp)
 
 static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
 {
+	struct agp_bridge_data *bridge = mem->bridge;
 	int i, j, num_entries;
 	unsigned long __iomem *cur_gatt;
 	unsigned long addr;
 
 	num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
 
-	if (type != 0 || mem->type != 0)
+	if (!bridge || type != mem->type ||
+	    bridge->driver->agp_type_to_mask_type(bridge, type))
 		return -EINVAL;
 
 	if ((pg_start + mem->page_count) > num_entries)
-- 
1.6.4.4