WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_pci.c

 	dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);
 	if (!dmah)
 		return NULL;
-	dmah->size = size;
-    dmah->vaddr = (void*)KernelAlloc(size);
+	dmah->size = size;
-    dmah->busaddr = GetPgAddr(dmah->vaddr);
+	dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, GFP_KERNEL | __GFP_COMP);
 	if (dmah->vaddr == NULL) {
 		kfree(dmah);
 	return dmah;
+}
-EXPORT_SYMBOL(drm_pci_alloc);
+EXPORT_SYMBOL(drm_pci_alloc);
-#if 0
-/**
+/*
- * \brief Free a PCI consistent memory block without freeing its descriptor.
+ * Free a PCI consistent memory block without freeing its descriptor.
+ *
  * This function is for internal use in the Linux-specific DRM core code.
  */
-void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
+void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
+{
 	unsigned long addr;
-	size_t sz;
-	if (dmah->vaddr) {
-		/* XXX - Is virt_to_page() legal for consistent mem? */
-		/* Unreserve */
-		for (addr = (unsigned long)dmah->vaddr, sz = dmah->size;
-		     sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
-			ClearPageReserved(virt_to_page((void *)addr));
+	size_t sz;
-		dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr,
+	if (dmah->vaddr) {
-				  dmah->busaddr);
+		KernelFree(dmah->vaddr);
+	}
+}
 /**
  * drm_pci_free - Free a PCI consistent memory block
  * @dev: DRM device
  * @dmah: handle to memory block
  */
 void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
+{
+	__drm_legacy_pci_free(dev, dmah);
-	__drm_pci_free(dev, dmah);
+	kfree(dmah);
 	kfree(dmah);
 EXPORT_SYMBOL(drm_pci_free);
 #endif /* __alpha__ */
 	return pci_domain_nr(dev->pdev->bus);
 }
-static int drm_pci_get_irq(struct drm_device *dev)
-{
-	return dev->pdev->irq;
-}
-static const char *drm_pci_get_name(struct drm_device *dev)
-{
-	struct pci_driver *pdriver = dev->driver->kdriver.pci;
-	return pdriver->name;
-}
-static int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
-{
-	int len, ret;
-	struct pci_driver *pdriver = dev->driver->kdriver.pci;
-	master->unique_len = 40;
+int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
-	master->unique_size = master->unique_len;
-	master->unique = kmalloc(master->unique_size, GFP_KERNEL);
-	if (master->unique == NULL)
-		return -ENOMEM;
 	len = snprintf(master->unique, master->unique_len,
-		       "pci:%04x:%02x:%02x.%d",
+	master->unique = kasprintf(GFP_KERNEL, "pci:%04x:%02x:%02x.%d",
-		       drm_get_pci_domain(dev),
+					drm_get_pci_domain(dev),
-		       dev->pdev->bus->number,
+					dev->pdev->bus->number,
+					PCI_SLOT(dev->pdev->devfn),
+					PCI_FUNC(dev->pdev->devfn));
-		       PCI_SLOT(dev->pdev->devfn),
-		       PCI_FUNC(dev->pdev->devfn));
-	if (len >= master->unique_len) {
-		DRM_ERROR("buffer overflow");
-		ret = -EINVAL;
+	if (!master->unique)
-		goto err;
-	} else
-		master->unique_len = len;
-	dev->devname =
-		kmalloc(strlen(pdriver->name) +
-			master->unique_len + 2, GFP_KERNEL);
-	if (dev->devname == NULL) {
-		ret = -ENOMEM;
-		goto err;
-	}
-	sprintf(dev->devname, "%s@%s", pdriver->name,
+		return -ENOMEM;
-		master->unique);
 	return 0;
+	master->unique_len = strlen(master->unique);
-err:
+	return 0;
 	return ret;
 EXPORT_SYMBOL(drm_pci_set_busid);
-static int drm_pci_set_unique(struct drm_device *dev,
+int drm_pci_set_unique(struct drm_device *dev,
-			      struct drm_master *master,
-			      struct drm_unique *u)
+		       struct drm_master *master,
-{
-	int domain, bus, slot, func, ret;
+		       struct drm_unique *u)
 	const char *bus_name;
 	int domain, bus, slot, func, ret;
 	master->unique_len = u->unique_len;
-	master->unique_size = u->unique_len + 1;
+	master->unique_len = u->unique_len;
 		goto err;
+	}
-	master->unique[master->unique_len] = '\0';
-	bus_name = dev->driver->bus->get_name(dev);
-	dev->devname = kmalloc(strlen(bus_name) +
-			       strlen(master->unique) + 2, GFP_KERNEL);
-	if (!dev->devname) {
-		ret = -ENOMEM;
-		goto err;
-	}
-	sprintf(dev->devname, "%s@%s", bus_name,
-		master->unique);
+	master->unique[master->unique_len] = '\0';
 	/* Return error if the busid submitted doesn't match the device's actual
 	 * busid.
 	 */
 		drm_agp_clear(dev);
 		kfree(dev->agp);
 		dev->agp = NULL;
+	}
+}
-static struct drm_bus drm_pci_bus = {
-	.bus_type = DRIVER_BUS_PCI,
-	.get_irq = drm_pci_get_irq,
-	.get_name = drm_pci_get_name,
-	.set_busid = drm_pci_set_busid,
-	.set_unique = drm_pci_set_unique,
-	.irq_by_busid = drm_pci_irq_by_busid,
-};
 #endif
 /**
- * Register.
- *
+ * drm_get_pci_dev - Register a PCI device with the DRM subsystem
- * \param pdev - PCI device structure
+ * @pdev: PCI device
- * \param ent entry from the PCI ID table with device type flags
+ * @ent: entry from the PCI ID table that matches @pdev
- * \return zero on success or a negative number on failure.
+ * @driver: DRM device driver
+ *
  * Attempt to gets inter module "drm" information. If we are first
  * then register the character device and inter module information.
  * Try and register, if we fail to register, backout previous work.
+ *
+ * NOTE: This function is deprecated, please use drm_dev_alloc() and
+ * drm_dev_register() instead and remove your ->load() callback.
+ *
  * Return: 0 on success or a negative error code on failure.
  */
 int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
 		    struct drm_driver *driver)

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_pci.c – Rev 6084 → 6296