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

Commit 5829d183 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: rip out dev->devname 



This was only ever used to pretty-print the irq driver name. And on
kms systems due to set_version bonghits we never set up the prettier
name, ever. Which make this a bit pointless.

Also, we can always dig out the driver-instance/irq relationship
through other means, so this isn't that useful. So just rip it out to
simplify the set_version/set_busid insanity a bit.

Also delete the temporary busname from drm_pci_set_busid, it's now
unused.

v2: Rebase on top of the new host1x drm_bus for tegra.

Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 53bf2a2b

drivers/gpu/drm/drm_ioctl.c

+0 −3
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ static void 
drm_unset_busid(struct drm_device *dev,

		struct drm_master *master)

{

	kfree(dev->devname);

	dev->devname = NULL;



	kfree(master->unique);

	master->unique = NULL;

	master->unique_len = 0;

drivers/gpu/drm/drm_irq.c

+1 −7
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ int drm_irq_install(struct drm_device *dev, int irq) 
{

	int ret;

	unsigned long sh_flags = 0;

	char *irqname;



	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))

		return -EINVAL;
@@ -272,13 +271,8 @@ int drm_irq_install(struct drm_device *dev, int irq) 
	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))

		sh_flags = IRQF_SHARED;



	if (dev->devname)

		irqname = dev->devname;

	else

		irqname = dev->driver->name;



	ret = request_irq(irq, dev->driver->irq_handler,

			  sh_flags, irqname, dev);

			  sh_flags, dev->driver->name, dev);



	if (ret < 0) {

		dev->irq_enabled = false;

drivers/gpu/drm/drm_pci.c

+0 −25
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ static const char *drm_pci_get_name(struct drm_device *dev) 
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;

	master->unique_size = master->unique_len;

	master->unique = kmalloc(master->unique_size, GFP_KERNEL);
@@ -168,18 +167,6 @@ static int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master) 
	} 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,

		master->unique);



	return 0;

err:

	return ret;
@@ -190,7 +177,6 @@ int drm_pci_set_unique(struct drm_device *dev, 
		       struct drm_unique *u)

{

	int domain, bus, slot, func, ret;

	const char *bus_name;



	master->unique_len = u->unique_len;

	master->unique_size = u->unique_len + 1;
@@ -207,17 +193,6 @@ int drm_pci_set_unique(struct drm_device *dev, 


	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);



	/* Return error if the busid submitted doesn't match the device's actual

	 * busid.

	 */

drivers/gpu/drm/drm_platform.c

+0 −11
Original line number Diff line number Diff line
@@ -101,17 +101,6 @@ static int drm_platform_set_busid(struct drm_device *dev, struct drm_master *mas 
		goto err;

	}



	dev->devname =

		kmalloc(strlen(dev->platformdev->name) +

			master->unique_len + 2, GFP_KERNEL);



	if (dev->devname == NULL) {

		ret = -ENOMEM;

		goto err;

	}



	sprintf(dev->devname, "%s@%s", dev->platformdev->name,

		master->unique);

	return 0;

err:

	return ret;

drivers/gpu/drm/drm_stub.c

+0 −5
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ static void drm_master_destroy(struct kref *kref) 
		master->unique_len = 0;

	}



	kfree(dev->devname);

	dev->devname = NULL;



	list_for_each_entry_safe(pt, next, &master->magicfree, head) {

		list_del(&pt->head);

		drm_ht_remove_item(&master->magiclist, &pt->hash_item);
@@ -648,8 +645,6 @@ static void drm_dev_release(struct kref *ref) 
	drm_minor_free(dev, DRM_MINOR_RENDER);

	drm_minor_free(dev, DRM_MINOR_CONTROL);



	kfree(dev->devname);



	mutex_destroy(&dev->master_mutex);

	kfree(dev);

}