Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dfc2b14 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Chris Wilson
Browse files

agp/intel: fix physical address mask bits for sandybridge 



It should shift bit 39-32 into pte's bit 11-4.

Reported-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 032d2a0d

drivers/char/agp/intel-gtt.c

+2 −2
Original line number Diff line number Diff line
@@ -1333,8 +1333,8 @@ static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge, 
static unsigned long intel_gen6_mask_memory(struct agp_bridge_data *bridge,

					    dma_addr_t addr, int type)

{

	/* Shift high bits down */

	addr |= (addr >> 28) & 0xff;

	/* gen6 has bit11-4 for physical addr bit39-32 */

	addr |= (addr >> 28) & 0xff0;



	/* Type checking must be done elsewhere */

	return addr | bridge->driver->masks[type].mask;