From: Jesse Barnes Date: Wed, 21 Jan 2009 03:10:54 +0000 (-0800) Subject: drm/i915: Fix cursor physical address choice to match the 2D driver. X-Git-Tag: v2.6.29-rc3~32^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2906f0258770d3a9c4e65364df8acc904e148bbe;p=linux-2.6-omap-h63xx.git drm/i915: Fix cursor physical address choice to match the 2D driver. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 57e8eb636a7..ee64b7301f6 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;