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

Commit 0bce0b7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart 

* 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] intel_agp: fix G965 GTT size detect
parents c3474be4 52ea0718

drivers/char/agp/intel-agp.c

+1 −2
Original line number Diff line number Diff line
@@ -431,9 +431,8 @@ static void intel_i830_init_gtt_entries(void) 


	if (IS_I965) {

		u32 pgetbl_ctl;

		pgetbl_ctl = readl(intel_i830_private.registers+I810_PGETBL_CTL);



		pci_read_config_dword(agp_bridge->dev, I810_PGETBL_CTL,

				      &pgetbl_ctl);

		/* The 965 has a field telling us the size of the GTT,

		 * which may be larger than what is necessary to map the

		 * aperture.