Commit b3f2333d authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: restrict the device list for shadow attached drivers 



There's really no need for the drm core to keep a list of all
devices of a given driver - the linux device model keeps perfect
track of this already for us.

The exception is old legacy ums drivers using pci shadow attaching.
So rename the lists to make the use case clearer and rip out everything
else.

v2: Rebase on top of David Herrmann's drm device register changes.
Also drop the bogus dev_set_drvdata for platform drivers that somehow
crept into the original version - drivers really should be in full
control of that field.

v3: Initialize driver->legacy_dev_list outside of the loop, spotted by
David Herrmann.

v4: Rebase on top of the newly created host1x drm_bus for tegra.

Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e2577d45

drivers/gpu/drm/drm_pci.c

+10 −2
Original line number Diff line number Diff line
@@ -346,6 +346,11 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 
		 driver->name, driver->major, driver->minor, driver->patchlevel,

		 driver->date, pci_name(pdev), dev->primary->index);



	/* No locking needed since shadow-attach is single-threaded since it may

	 * only be called from the per-driver module init hook. */

	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);



	return 0;



err_pci:
@@ -375,7 +380,6 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) 


	DRM_DEBUG("\n");



	INIT_LIST_HEAD(&driver->device_list);

	driver->kdriver.pci = pdriver;

	driver->bus = &drm_pci_bus;
@@ -383,6 +387,7 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) 
		return pci_register_driver(pdriver);



	/* If not using KMS, fall back to stealth mode manual scanning. */

	INIT_LIST_HEAD(&driver->legacy_dev_list);

	for (i = 0; pdriver->id_table[i].vendor != 0; i++) {

		pid = &pdriver->id_table[i];
@@ -465,8 +470,11 @@ void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver) 
	if (driver->driver_features & DRIVER_MODESET) {

		pci_unregister_driver(pdriver);

	} else {

		list_for_each_entry_safe(dev, tmp, &driver->device_list, driver_item)

		list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,

					 legacy_dev_list) {

			drm_put_dev(dev);

			list_del(&dev->legacy_dev_list);

		}

	}

	DRM_INFO("Module unloaded\n");

}

drivers/gpu/drm/drm_platform.c

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ int drm_platform_init(struct drm_driver *driver, struct platform_device *platfor 


	driver->kdriver.platform_device = platform_device;

	driver->bus = &drm_platform_bus;

	INIT_LIST_HEAD(&driver->device_list);

	return drm_get_platform_dev(platform_device, driver);

}

EXPORT_SYMBOL(drm_platform_init);

drivers/gpu/drm/drm_stub.c

+0 −4
Original line number Diff line number Diff line
@@ -563,8 +563,6 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) 
			goto err_unload;

	}



	list_add_tail(&dev->driver_item, &dev->driver->device_list);



	ret = 0;

	goto out_unlock;
@@ -614,7 +612,5 @@ void drm_dev_unregister(struct drm_device *dev) 
	drm_unplug_minor(dev->control);

	drm_unplug_minor(dev->render);

	drm_unplug_minor(dev->primary);



	list_del(&dev->driver_item);

}

EXPORT_SYMBOL(drm_dev_unregister);

drivers/gpu/drm/drm_usb.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ int drm_usb_init(struct drm_driver *driver, struct usb_driver *udriver) 
	int res;

	DRM_DEBUG("\n");



	INIT_LIST_HEAD(&driver->device_list);

	driver->kdriver.usb = udriver;

	driver->bus = &drm_usb_bus;

drivers/gpu/drm/tegra/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ int drm_host1x_init(struct drm_driver *driver, struct host1x_device *device) 
	struct drm_device *drm;

	int ret;



	INIT_LIST_HEAD(&driver->device_list);

	driver->bus = &drm_host1x_bus;



	drm = drm_dev_alloc(driver, &device->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE