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>

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 57e8eb6..ee64b73 100644 (file)
--- 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;