diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-14 20:30:13 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-14 22:13:12 +0200 |
| commit | b1c5b0f8cc16a1d22e2e521c4236a6ceca1b2983 (patch) | |
| tree | c9d2ae374fb56af57532bb929e0c2e1cb0be7ac7 /drivers/char/agp | |
| parent | drm/i915/sdvo: Propagate i2c error from switching DDC control bus. (diff) | |
| download | linux-b1c5b0f8cc16a1d22e2e521c4236a6ceca1b2983.tar.xz linux-b1c5b0f8cc16a1d22e2e521c4236a6ceca1b2983.zip | |
agp/intel: Remove redundant setting of gtt_mappable_entries
Two calls enter, only one will leave.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char/agp')
| -rw-r--r-- | drivers/char/agp/intel-gtt.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index dedf05dc433d..791582c73ff7 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/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; |