---

yaml
---
r: 218026
b: refs/heads/master
c: b1c5b0f
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 819f3fb7fe349d0e6aadbd7088529ab95fe5cd9f
+refs/heads/master: b1c5b0f8cc16a1d22e2e521c4236a6ceca1b2983

trunk/drivers/char/agp/intel-gtt.c

@@ -774,18 +774,17 @@ static unsigned int intel_gtt_total_entries(void)
 static unsigned int intel_gtt_mappable_entries(void)
 {
 	unsigned int aperture_size;
-	u16 gmch_ctrl;
 
-	aperture_size = 1024 * 1024;
+	if (INTEL_GTT_GEN == 2) {
+		u16 gmch_ctrl;
 
-	pci_read_config_word(intel_private.bridge_dev,
-			     I830_GMCH_CTRL, &gmch_ctrl);
+		pci_read_config_word(intel_private.bridge_dev,
+				     I830_GMCH_CTRL, &gmch_ctrl);
 
-	if (INTEL_GTT_GEN == 2) {
 		if ((gmch_ctrl & I830_GMCH_MEM_MASK) == I830_GMCH_MEM_64M)
-			aperture_size *= 64;
+			aperture_size = MB(64);
 		else
-			aperture_size *= 128;
+			aperture_size = MB(128);
 	} else {
 		/* 9xx supports large sizes, just look at the length */
 		aperture_size = pci_resource_len(intel_private.pcidev, 2);
@@ -799,8 +798,6 @@ static int intel_gtt_init(void)
 	u32 gtt_map_size;
 	int ret;
 
-	intel_private.base.gtt_mappable_entries = intel_gtt_mappable_entries();
-
 	ret = intel_private.driver->setup();
 	if (ret != 0)
 		return ret;