Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2906f025 authored by Jesse Barnes's avatar Jesse Barnes Committed by Dave Airlie
Browse files

drm/i915: Fix cursor physical address choice to match the 2D driver. 



Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 1bb88edb

drivers/gpu/drm/i915/i915_dma.c

+4 −1
Original line number Diff line number Diff line
@@ -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;