diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-22 09:07:12 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-11 15:35:40 -0500 |
commit | 35c3047ad15849335242b847c94f180ef45db490 (patch) | |
tree | f298d7ecf12a9c3dbfa103a8e4cf0766f261260b /drivers/gpu/drm/i915/intel_display.c | |
parent | a6044e23b784544fe567db75dbf9c4f684bd6d5b (diff) |
drm/i915: Use the mappable sizes determined by GTT for consistency.
There should be no difference, but we can eliminate redundant code.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index efa88551cbe4..9d97fd4e5558 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -6694,12 +6694,7 @@ void intel_modeset_init(struct drm_device *dev) | |||
6694 | dev->mode_config.max_width = 8192; | 6694 | dev->mode_config.max_width = 8192; |
6695 | dev->mode_config.max_height = 8192; | 6695 | dev->mode_config.max_height = 8192; |
6696 | } | 6696 | } |
6697 | 6697 | dev->mode_config.fb_base = dev->agp->base; | |
6698 | /* set memory base */ | ||
6699 | if (IS_GEN2(dev)) | ||
6700 | dev->mode_config.fb_base = pci_resource_start(dev->pdev, 0); | ||
6701 | else | ||
6702 | dev->mode_config.fb_base = pci_resource_start(dev->pdev, 2); | ||
6703 | 6698 | ||
6704 | if (IS_MOBILE(dev) || !IS_GEN2(dev)) | 6699 | if (IS_MOBILE(dev) || !IS_GEN2(dev)) |
6705 | dev_priv->num_pipe = 2; | 6700 | dev_priv->num_pipe = 2; |