WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/i915_gem_stolen.c

  */
 static unsigned long i915_stolen_to_physical(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct pci_dev *pdev = dev_priv->bridge_dev;
+	struct resource *r;
 	u32 base;
+	/* Almost universally we can find the Graphics Base of Stolen Memory
+	 * at offset 0x5c in the igfx configuration space. On a few (desktop)
+	 * machines this is also mirrored in the bridge device at different
-	/* On the machines I have tested the Graphics Base of Stolen Memory
+	 * locations, or in the MCHBAR. On gen2, the layout is again slightly
+	 * different with the Graphics Segment immediately following Top of
-	 * is unreliable, so on those compute the base by subtracting the
+	 * Memory (or Top of Usable DRAM). Note it appears that TOUD is only
-	 * stolen memory from the Top of Low Usable DRAM which is where the
+	 * reported by 865g, so we just use the top of memory as determined
-	 * BIOS places the graphics stolen memory.
-	 *
-	 * On gen2, the layout is slightly different with the Graphics Segment
-	 * immediately following Top of Memory (or Top of Usable DRAM). Note
-	 * it appears that TOUD is only reported by 865g, so we just use the
-	 * top of memory as determined by the e820 probe.
+	 * by the e820 probe.
-	 *
 	 * XXX gen2 requires an unavailable symbol and 945gm fails with
-	 * its value of TOLUD.
+	 * XXX However gen2 requires an unavailable symbol.
 	 */
-	base = 0;
-	if (INTEL_INFO(dev)->gen >= 6) {
-		/* Read Base Data of Stolen Memory Register (BDSM) directly.
-		 * Note that there is also a MCHBAR miror at 0x1080c0 or
-		 * we could use device 2:0x5c instead.
-	 */
-		pci_read_config_dword(pdev, 0xB0, &base);
-		base &= ~4095; /* lower bits used for locking register */
+	base = 0;
-	} else if (INTEL_INFO(dev)->gen > 3 || IS_G33(dev)) {
+	if (INTEL_INFO(dev)->gen >= 3) {
+		/* Read Graphics Base of Stolen Memory directly */
+		pci_read_config_dword(dev->pdev, 0x5c, &base);
-		/* Read Graphics Base of Stolen Memory directly */
+		base &= ~((1<<20) - 1);
-		pci_read_config_dword(pdev, 0xA4, &base);
-#if 0
-	} else if (IS_GEN3(dev)) {
-		u8 val;
-		/* Stolen is immediately below Top of Low Usable DRAM */
-		pci_read_config_byte(pdev, 0x9c, &val);
-		base = val >> 3 << 27;
-	base -= dev_priv->mm.gtt->stolen_size;
+	} else { /* GEN2 */
-	} else {
+#if 0
 		/* Stolen is immediately above Top of Memory */
 		base = max_low_pfn_mapped << PAGE_SHIFT;
+#endif
+	}
+	if (base == 0)
+		return 0;
+#if 0
+	/* Verify that nothing else uses this physical address. Stolen
+	 * memory should be reserved by the BIOS and hidden from the
+	 * kernel. So if the region is already marked as busy, something
+	 * is seriously wrong.
+	 */
+	r = devm_request_mem_region(dev->dev, base, dev_priv->gtt.stolen_size,
+				    "Graphics Stolen Memory");
+	if (r == NULL) {
+		DRM_ERROR("conflict detected with stolen region: [0x%08x - 0x%08x]\n",
+			  base, base + (uint32_t)dev_priv->gtt.stolen_size);
-#endif
+		base = 0;
+	}
 #endif
 	return base;
+}
+static int i915_setup_compression(struct drm_device *dev, int size)
-static int i915_setup_compression(struct drm_device *dev, int size)
-{
-	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_mm_node *compressed_fb, *uninitialized_var(compressed_llb);
-	/* Try to over-allocate to reduce reallocations and fragmentation */
-	compressed_fb = drm_mm_search_free(&dev_priv->mm.stolen,
-					   size <<= 1, 4096, 0);
+{
-	if (!compressed_fb)
+	struct drm_i915_private *dev_priv = dev->dev_private;
-		compressed_fb = drm_mm_search_free(&dev_priv->mm.stolen,
+	struct drm_mm_node *compressed_fb, *uninitialized_var(compressed_llb);
+	int ret;
+	compressed_fb = kzalloc(sizeof(*compressed_fb), GFP_KERNEL);
+	if (!compressed_fb)
+		goto err_llb;
+	/* Try to over-allocate to reduce reallocations and fragmentation */
+	ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_fb,
+				 size <<= 1, 4096, DRM_MM_SEARCH_DEFAULT);
+	if (ret)
-						   size >>= 1, 4096, 0);
+		ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_fb,
-	if (compressed_fb)
+					 size >>= 1, 4096,
-		compressed_fb = drm_mm_get_block(compressed_fb, size, 4096);
+					 DRM_MM_SEARCH_DEFAULT);
-	if (!compressed_fb)
+	if (ret)
-		goto err;
+		goto err_llb;
-	if (HAS_PCH_SPLIT(dev))
-		I915_WRITE(ILK_DPFC_CB_BASE, compressed_fb->start);
-	else if (IS_GM45(dev)) {
-		I915_WRITE(DPFC_CB_BASE, compressed_fb->start);
-	} else {
+	if (HAS_PCH_SPLIT(dev))
-		compressed_llb = drm_mm_search_free(&dev_priv->mm.stolen,
+		I915_WRITE(ILK_DPFC_CB_BASE, compressed_fb->start);
+	else if (IS_GM45(dev)) {
+		I915_WRITE(DPFC_CB_BASE, compressed_fb->start);
+	} else {
+		compressed_llb = kzalloc(sizeof(*compressed_llb), GFP_KERNEL);
+		if (!compressed_llb)
-, 4096, 0);
+			goto err_fb;
 		if (compressed_llb)
-			compressed_llb = drm_mm_get_block(compressed_llb,
+		ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_llb,
-, 4096);
+, 4096, DRM_MM_SEARCH_DEFAULT);
-		if (!compressed_llb)
+		if (ret)
 			goto err_fb;
-		dev_priv->compressed_llb = compressed_llb;
+		dev_priv->fbc.compressed_llb = compressed_llb;
 		I915_WRITE(FBC_CFB_BASE,
 			   dev_priv->mm.stolen_base + compressed_fb->start);
 		I915_WRITE(FBC_LL_BASE,
+			   dev_priv->mm.stolen_base + compressed_llb->start);
-			   dev_priv->mm.stolen_base + compressed_llb->start);
+	}
-	}
+	dev_priv->fbc.compressed_fb = compressed_fb;
+	dev_priv->fbc.size = size;
-	dev_priv->compressed_fb = compressed_fb;
+	DRM_DEBUG_KMS("reserved %d bytes of contiguous stolen space for FBC\n",
-	dev_priv->cfb_size = size;
+		      size);
-	DRM_DEBUG_KMS("reserved %d bytes of contiguous stolen space for FBC\n",
+	return 0;
-		      size);
 err_fb:
-	return 0;
+	kfree(compressed_llb);
 	drm_mm_remove_node(compressed_fb);
-err_fb:
+err_llb:
-	drm_mm_put_block(compressed_fb);
+	kfree(compressed_fb);
 void i915_gem_stolen_cleanup_compression(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	if (dev_priv->cfb_size == 0)
+	if (dev_priv->fbc.size == 0)
 		return;
+	if (dev_priv->fbc.compressed_fb) {
+		drm_mm_remove_node(dev_priv->fbc.compressed_fb);
-	if (dev_priv->compressed_fb)
+		kfree(dev_priv->fbc.compressed_fb);
+	}
-	drm_mm_put_block(dev_priv->compressed_fb);
+	if (dev_priv->fbc.compressed_llb) {
 		drm_mm_remove_node(dev_priv->fbc.compressed_llb);
-	if (dev_priv->compressed_llb)
+		kfree(dev_priv->fbc.compressed_llb);
 		drm_mm_put_block(dev_priv->compressed_llb);
+	dev_priv->fbc.size = 0;
+}
-	dev_priv->cfb_size = 0;
+void i915_gem_cleanup_stolen(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 void i915_gem_cleanup_stolen(struct drm_device *dev)
 	if (!drm_mm_initialized(&dev_priv->mm.stolen))
-	struct drm_i915_private *dev_priv = dev->dev_private;
+		return;
+	i915_gem_stolen_cleanup_compression(dev);
+	drm_mm_takedown(&dev_priv->mm.stolen);
+}
-	i915_gem_stolen_cleanup_compression(dev);
+int i915_gem_init_stolen(struct drm_device *dev)
 	drm_mm_takedown(&dev_priv->mm.stolen);
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int bios_reserved = 0;
+	if (dev_priv->gtt.stolen_size == 0)
+		return 0;
+	dev_priv->mm.stolen_base = i915_stolen_to_physical(dev);
+	if (dev_priv->mm.stolen_base == 0)
-int i915_gem_init_stolen(struct drm_device *dev)
+		return 0;
-{
+	DRM_DEBUG_KMS("found %zd bytes of stolen memory at %08lx\n",
-	struct drm_i915_private *dev_priv = dev->dev_private;
+		      dev_priv->gtt.stolen_size, dev_priv->mm.stolen_base);
-	dev_priv->mm.stolen_base = i915_stolen_to_physical(dev);
+	if (IS_VALLEYVIEW(dev))
 	obj = i915_gem_object_alloc(dev);
 	if (obj == NULL)
 		return NULL;
-	if (drm_gem_private_object_init(dev, &obj->base, stolen->size))
 		goto cleanup;
 	drm_gem_private_object_init(dev, &obj->base, stolen->size);
 	i915_gem_object_init(obj, &i915_gem_object_stolen_ops);
 	obj->pages = i915_pages_create_for_stolen(dev,
 						  stolen->start, stolen->size);
 	if (obj->pages == NULL)
 		goto cleanup;
-	obj->has_dma_mapping = true;
-	obj->pages_pin_count = 1;
+	obj->has_dma_mapping = true;
-	obj->stolen = stolen;
+	i915_gem_object_pin_pages(obj);
 	obj->stolen = stolen;
 	obj->base.write_domain = I915_GEM_DOMAIN_GTT;
 i915_gem_object_create_stolen(struct drm_device *dev, u32 size)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_object *obj;
 	struct drm_mm_node *stolen;
+	int ret;
-	if (dev_priv->mm.stolen_base == 0)
+	if (!drm_mm_initialized(&dev_priv->mm.stolen))
 		return NULL;
 	DRM_DEBUG_KMS("creating stolen object: size=%x\n", size);
 	if (size == 0)
 		return NULL;
-	stolen = drm_mm_search_free(&dev_priv->mm.stolen, size, 4096, 0);
 	if (stolen)
+	stolen = kzalloc(sizeof(*stolen), GFP_KERNEL);
+	if (!stolen)
+		return NULL;
+	ret = drm_mm_insert_node(&dev_priv->mm.stolen, stolen, size,
+, DRM_MM_SEARCH_DEFAULT);
+	if (ret) {
-		stolen = drm_mm_get_block(stolen, size, 4096);
+		kfree(stolen);
-	if (stolen == NULL)
+		return NULL;
 		return NULL;
+	obj = _i915_gem_object_create_stolen(dev, stolen);
-	obj = _i915_gem_object_create_stolen(dev, stolen);
+	if (obj)
-	if (obj)
+		return obj;
 		return obj;
 	drm_mm_remove_node(stolen);
-	drm_mm_put_block(stolen);
+	kfree(stolen);
 	return NULL;
+}
 struct drm_i915_gem_object *
+i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
-i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
+					       u32 stolen_offset,
-					       u32 stolen_offset,
+					       u32 gtt_offset,
+					       u32 size)
+{
-					       u32 gtt_offset,
+	struct drm_i915_private *dev_priv = dev->dev_private;
-					       u32 size)
+	struct i915_address_space *ggtt = &dev_priv->gtt.base;
 	struct drm_i915_gem_object *obj;
-	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct drm_mm_node *stolen;
-	struct drm_i915_gem_object *obj;
+	struct i915_vma *vma;
-	struct drm_mm_node *stolen;
+	int ret;
 	if (dev_priv->mm.stolen_base == 0)
-		return NULL;
+	if (!drm_mm_initialized(&dev_priv->mm.stolen))
 		return NULL;
-	DRM_DEBUG_KMS("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n",
+	DRM_DEBUG_KMS("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n",
+			stolen_offset, gtt_offset, size);
-			stolen_offset, gtt_offset, size);
+	/* KISS and expect everything to be page-aligned */
+	BUG_ON(stolen_offset & 4095);
+	BUG_ON(size & 4095);
-	/* KISS and expect everything to be page-aligned */
-	BUG_ON(stolen_offset & 4095);
+	if (WARN_ON(size == 0))
+		return NULL;
 	BUG_ON(gtt_offset & 4095);
-	BUG_ON(size & 4095);
+	stolen = kzalloc(sizeof(*stolen), GFP_KERNEL);
 	if (!stolen)
-	if (WARN_ON(size == 0))
+		return NULL;
 		return NULL;
+	stolen->start = stolen_offset;
+	stolen->size = size;
-	stolen = drm_mm_create_block(&dev_priv->mm.stolen,
+	ret = drm_mm_reserve_node(&dev_priv->mm.stolen, stolen);
-				     stolen_offset, size,
+	if (ret) {
+		DRM_DEBUG_KMS("failed to allocate stolen space\n");
+		kfree(stolen);
+		return NULL;
+	}
+	obj = _i915_gem_object_create_stolen(dev, stolen);
+	if (obj == NULL) {
+		DRM_DEBUG_KMS("failed to allocate stolen object\n");
+		drm_mm_remove_node(stolen);
+		kfree(stolen);
-				     false);
+		return NULL;
 	if (stolen == NULL) {
 		DRM_DEBUG_KMS("failed to allocate stolen space\n");
-		return NULL;
+	/* Some objects just need physical mem from stolen space */
 	if (gtt_offset == I915_GTT_OFFSET_NONE)
+		return obj;
-	obj = _i915_gem_object_create_stolen(dev, stolen);
-	if (obj == NULL) {
+	vma = i915_gem_vma_create(obj, ggtt);
-		DRM_DEBUG_KMS("failed to allocate stolen object\n");
+	if (IS_ERR(vma)) {
-		drm_mm_put_block(stolen);
+		ret = PTR_ERR(vma);
-		return NULL;
+		goto err_out;
 	}
 	/* To simplify the initialisation sequence between KMS and GTT,
-	 * we allow construction of the stolen object prior to
-	 * setting up the GTT space. The actual reservation will occur
-	 * later.
-	 */
+	 * we allow construction of the stolen object prior to
-	if (drm_mm_initialized(&dev_priv->mm.gtt_space)) {
+	 * setting up the GTT space. The actual reservation will occur
-		obj->gtt_space = drm_mm_create_block(&dev_priv->mm.gtt_space,
+	 * later.
-						     gtt_offset, size,
+	 */
+	vma->node.start = gtt_offset;
+	vma->node.size = size;
+	if (drm_mm_initialized(&ggtt->mm)) {
+		ret = drm_mm_reserve_node(&ggtt->mm, &vma->node);
+		if (ret) {
+			DRM_DEBUG_KMS("failed to allocate stolen GTT space\n");
+			goto err_vma;
+		}
 						     false);
 		if (obj->gtt_space == NULL) {
-			DRM_DEBUG_KMS("failed to allocate stolen GTT space\n");
+	obj->has_global_gtt_mapping = 1;
 			drm_gem_object_unreference(&obj->base);
-			return NULL;
+	list_add_tail(&obj->global_list, &dev_priv->mm.bound_list);
-		}
+	list_add_tail(&vma->mm_list, &ggtt->inactive_list);
-	} else
+	return obj;
 		obj->gtt_space = I915_GTT_RESERVED;
 err_vma:

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_gem_stolen.c – Rev 3764 → 4104