diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-03 10:27:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-03 10:27:21 +1000 |
| commit | 5f3dbedf2770cf6aeb5547b3c56734dee4e5186b (patch) | |
| tree | e4930f7f4fe27b06079d2df8072a2bdf6457c666 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 7a1fb5d06d3936c0982e2cf8b53b046244a9aad6 (diff) | |
| parent | 1055f9ddad093f54dfd708a0f976582034d4ce1a (diff) | |
Merge branch 'drm-intel-next' of ../anholt-2.6 into drm-linus
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 9648d79fe36..c23b3a95b7c 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -922,7 +922,7 @@ static int i915_probe_agp(struct drm_device *dev, unsigned long *aperture_size, * Some of the preallocated space is taken by the GTT * and popup. GTT is 1K per MB of aperture size, and popup is 4K. */ - if (IS_G4X(dev)) + if (IS_G4X(dev) || IS_IGD(dev)) overhead = 4096; else overhead = (*aperture_size / 1024) + 4096; @@ -1030,13 +1030,6 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto destroy_ringbuffer; - /* FIXME: re-add hotplug support */ -#if 0 - ret = drm_hotplug_init(dev); - if (ret) - goto destroy_ringbuffer; -#endif - /* Always safe in the mode setting case. */ /* FIXME: do pre/post-mode set stuff in core KMS code */ dev->vblank_disable_allowed = 1; |