Skip to contentSkip to conversation

drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL

PATCH New Daniel Vetter 1 participant 1 message Jul 23, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL

Our phys_object code can't deal with stolen memory and so blows up. Fixing this is quite a bit of work and not worth it much for a single page object, so just opt-out.

This is necessary prep work to enable stolen on gen2/3 platforms where the overlay register file isn't stored in the gtt.

---
 drivers/gpu/drm/i915/intel_overlay.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_overlay.c +3 -1
index 2abb53e..9ec5a4e 100644
@@ -1333,7 +1333,9 @@ void intel_setup_overlay(struct drm_device *dev)
 
 	overlay->dev = dev;
 
-	reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE);
+	reg_bo = NULL;
+	if (!OVERLAY_NEEDS_PHYSICAL(dev))
+		reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE);
 	if (reg_bo == NULL)
 		reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
 	if (reg_bo == NULL)
Signature · 1 line
1.8.3.2