diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-21 04:10:54 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-01-22 13:29:03 +0100 |
| commit | 2906f0258770d3a9c4e65364df8acc904e148bbe (patch) | |
| tree | bb09cc8f27b8c495a165019f008690dcf692ce3e /drivers/gpu | |
| parent | drm: stash AGP include under the do-we-have-AGP ifdef (diff) | |
| download | linux-2906f0258770d3a9c4e65364df8acc904e148bbe.tar.xz linux-2906f0258770d3a9c4e65364df8acc904e148bbe.zip | |
drm/i915: Fix cursor physical address choice to match the 2D driver.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 57e8eb636a77..ee64b7301f67 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -944,11 +944,14 @@ static int i915_load_modeset_init(struct drm_device *dev) dev->mode_config.fb_base = drm_get_resource_start(dev, fb_bar) & 0xff000000; - if (IS_MOBILE(dev) || (IS_I9XX(dev) && !IS_I965G(dev) && !IS_G33(dev))) + if (IS_MOBILE(dev) || IS_I9XX(dev)) dev_priv->cursor_needs_physical = true; else dev_priv->cursor_needs_physical = false; + if (IS_I965G(dev) || IS_G33(dev)) + dev_priv->cursor_needs_physical = false; + ret = i915_probe_agp(dev, &agp_size, &prealloc_size); if (ret) goto kfree_devname; |