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@pfu.pl Signed-off-by: Francisco Jerez currojerez@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)
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.
Signed-off-by: Francisco Jerez currojerez@riseup.net Tested-by: Grzesiek Sójka pld@pfu.pl --- v2: "amd_remove_memory" bails out when it's given user memory, fix it too.
drivers/char/agp/amd-k7-agp.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index b6b1568..b1b4362 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c @@ -309,7 +309,8 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;
- if (type != 0 || mem->type != 0) + if (type != mem->type || + agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) return -EINVAL;
if ((pg_start + mem->page_count) > num_entries) @@ -348,7 +349,8 @@ static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type) unsigned long __iomem *cur_gatt; unsigned long addr;
- if (type != 0 || mem->type != 0) + if (type != mem->type || + agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) return -EINVAL;
for (i = pg_start; i < (mem->page_count + pg_start); i++) {
dri-devel@lists.freedesktop.org
-
Francisco Jerez