Skip to content

Commit

Permalink
[efficeon-agp] Add missing memory mask
Browse files Browse the repository at this point in the history
Original patch by Benjamin Herrenschmidt after debugging by Brian Hinz.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Brian Hinz <bphinz@hotmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
H. Peter Anvin authored and Linus Torvalds committed Apr 15, 2006
1 parent 1d73135 commit 1f60245
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/char/agp/efficeon-agp.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ static struct gatt_mask efficeon_generic_masks[] =
{.mask = 0x00000001, .type = 0}
};

/* This function does the same thing as mask_memory() for this chipset... */
static inline unsigned long efficeon_mask_memory(unsigned long addr)
{
return addr | 0x00000001;
}

static struct aper_size_info_lvl2 efficeon_generic_sizes[4] =
{
{256, 65536, 0},
Expand Down Expand Up @@ -251,7 +257,7 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t
last_page = NULL;
for (i = 0; i < count; i++) {
int index = pg_start + i;
unsigned long insert = mem->memory[i];
unsigned long insert = efficeon_mask_memory(mem->memory[i]);

page = (unsigned int *) efficeon_private.l1_table[index >> 10];

Expand Down

0 comments on commit 1f60245

Please sign in to comment.