diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-09-08 15:26:07 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 16:20:20 -0400 |
commit | ac622a9cdb742cad90648d95f2c4877774518f19 (patch) | |
tree | b32f6747547fc1d1ac5436d253be5f730e7e92cd | |
parent | 239918f7a5ac118ecfe9c55a4cfd25d7767b674a (diff) |
drm/i915: drop prealloc_start from i915_dma gtt init
Not used and simply confusing.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 47228cb16901..a693b27f3df4 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1000,8 +1000,7 @@ intel_teardown_mchbar(struct drm_device *dev) | |||
1000 | * how much was set aside so we can use it for our own purposes. | 1000 | * how much was set aside so we can use it for our own purposes. |
1001 | */ | 1001 | */ |
1002 | static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size, | 1002 | static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size, |
1003 | uint32_t *preallocated_size, | 1003 | uint32_t *preallocated_size) |
1004 | uint32_t *start) | ||
1005 | { | 1004 | { |
1006 | struct drm_i915_private *dev_priv = dev->dev_private; | 1005 | struct drm_i915_private *dev_priv = dev->dev_private; |
1007 | u16 tmp = 0; | 1006 | u16 tmp = 0; |
@@ -1152,7 +1151,6 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size, | |||
1152 | } | 1151 | } |
1153 | 1152 | ||
1154 | *preallocated_size = stolen - overhead; | 1153 | *preallocated_size = stolen - overhead; |
1155 | *start = overhead; | ||
1156 | 1154 | ||
1157 | return 0; | 1155 | return 0; |
1158 | } | 1156 | } |
@@ -1362,7 +1360,6 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) | |||
1362 | } | 1360 | } |
1363 | 1361 | ||
1364 | static int i915_load_modeset_init(struct drm_device *dev, | 1362 | static int i915_load_modeset_init(struct drm_device *dev, |
1365 | unsigned long prealloc_start, | ||
1366 | unsigned long prealloc_size, | 1363 | unsigned long prealloc_size, |
1367 | unsigned long agp_size) | 1364 | unsigned long agp_size) |
1368 | { | 1365 | { |
@@ -2051,7 +2048,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
2051 | struct drm_i915_private *dev_priv; | 2048 | struct drm_i915_private *dev_priv; |
2052 | resource_size_t base, size; | 2049 | resource_size_t base, size; |
2053 | int ret = 0, mmio_bar; | 2050 | int ret = 0, mmio_bar; |
2054 | uint32_t agp_size, prealloc_size, prealloc_start; | 2051 | uint32_t agp_size, prealloc_size; |
2055 | /* i915 has 4 more counters */ | 2052 | /* i915 has 4 more counters */ |
2056 | dev->counters += 4; | 2053 | dev->counters += 4; |
2057 | dev->types[6] = _DRM_STAT_IRQ; | 2054 | dev->types[6] = _DRM_STAT_IRQ; |
@@ -2110,7 +2107,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
2110 | "performance may suffer.\n"); | 2107 | "performance may suffer.\n"); |
2111 | } | 2108 | } |
2112 | 2109 | ||
2113 | ret = i915_probe_agp(dev, &agp_size, &prealloc_size, &prealloc_start); | 2110 | ret = i915_probe_agp(dev, &agp_size, &prealloc_size); |
2114 | if (ret) | 2111 | if (ret) |
2115 | goto out_iomapfree; | 2112 | goto out_iomapfree; |
2116 | 2113 | ||
@@ -2202,8 +2199,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
2202 | intel_detect_pch(dev); | 2199 | intel_detect_pch(dev); |
2203 | 2200 | ||
2204 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | 2201 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
2205 | ret = i915_load_modeset_init(dev, prealloc_start, | 2202 | ret = i915_load_modeset_init(dev, prealloc_size, agp_size); |
2206 | prealloc_size, agp_size); | ||
2207 | if (ret < 0) { | 2203 | if (ret < 0) { |
2208 | DRM_ERROR("failed to init modeset\n"); | 2204 | DRM_ERROR("failed to init modeset\n"); |
2209 | goto out_workqueue_free; | 2205 | goto out_workqueue_free; |