android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agp/intel: Remove redundant setting of gtt_mappable_entries

Browse Source 
Two calls enter, only one will leave.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-09-14 19:30:13 +01:00
parent 819f3fb7fe
commit b1c5b0f8cc
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/char/agp/intel-gtt.c
View File

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