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

Commit e67aa27a authored by Dave Airlie's avatar Dave Airlie Committed by Linus Torvalds
Browse files

intel-agp: Fix i830 mask variable that changed with G33 support 



The mask on i830 should be 0x70 always, later chips 0xF0 should be okay.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
Acked-by: default avatarZhenyu Wang <zhenyu.z.wang@intel.com>
Cc: Michael Haas <laga@laga.ath.cx>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8c8bd037

drivers/char/agp/agp.h

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct agp_bridge_data { 
#define I830_GMCH_MEM_MASK		0x1

#define I830_GMCH_MEM_64M		0x1

#define I830_GMCH_MEM_128M		0

#define I830_GMCH_GMS_MASK		0xF0

#define I830_GMCH_GMS_MASK		0x70

#define I830_GMCH_GMS_DISABLED		0x00

#define I830_GMCH_GMS_LOCAL		0x10

#define I830_GMCH_GMS_STOLEN_512	0x20
@@ -190,6 +190,7 @@ struct agp_bridge_data { 
#define INTEL_I830_ERRSTS	0x92



/* Intel 855GM/852GM registers */

#define I855_GMCH_GMS_MASK		0xF0

#define I855_GMCH_GMS_STOLEN_0M		0x0

#define I855_GMCH_GMS_STOLEN_1M		(0x1 << 4)

#define I855_GMCH_GMS_STOLEN_4M		(0x2 << 4)

drivers/char/agp/intel-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void intel_i830_init_gtt_entries(void) 
		 */

		if (IS_G33)

			size = 0;

		switch (gmch_ctrl & I830_GMCH_GMS_MASK) {

		switch (gmch_ctrl & I855_GMCH_GMS_MASK) {

		case I855_GMCH_GMS_STOLEN_1M:

			gtt_entries = MB(1) - KB(size);

			break;