Commit c22f0ace authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

drm: merge device setup into drm_dev_register() 



All bus drivers do device setup themselves. This requires us to adjust all
of them if we introduce new core features. Thus, merge all these into a
uniform drm_dev_register() helper.

Note that this removes the drm_lastclose() error path for AGP as it is
horribly broken. Moreover, no bus driver called this in any other error
path either. Instead, we use the recently introduced AGP cleanup helpers.

We also keep a DRIVER_MODESET condition around pci_set_drvdata() to keep
semantics.

[airlied: keep passing flags through so drivers don't oops on load]

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1bb72532

drivers/gpu/drm/drm_pci.c

+7 −49
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 


	ret = pci_enable_device(pdev);

	if (ret)

		goto err_g1;

		goto err_free;



	dev->pdev = pdev;

	dev->pci_device = pdev->device;
@@ -338,65 +338,23 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 
	dev->hose = pdev->sysdata;

#endif



	mutex_lock(&drm_global_mutex);



	if ((ret = drm_fill_in_dev(dev, ent, driver))) {

		printk(KERN_ERR "DRM: Fill_in_dev failed.\n");

		goto err_g2;

	}



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		pci_set_drvdata(pdev, dev);

		ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);

		if (ret)

			goto err_g2;

	}



	if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {

		ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);

		if (ret)

			goto err_g21;

	}



	if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY)))

		goto err_g3;



	if (dev->driver->load) {

		ret = dev->driver->load(dev, ent->driver_data);

		if (ret)

			goto err_g4;

	}



	/* setup the grouping for the legacy output */

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = drm_mode_group_init_legacy_group(dev,

						&dev->primary->mode_group);

	ret = drm_dev_register(dev, ent->driver_data);

	if (ret)

			goto err_g4;

	}



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

		goto err_pci;



	DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",

		 driver->name, driver->major, driver->minor, driver->patchlevel,

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



	mutex_unlock(&drm_global_mutex);

	return 0;



err_g4:

	drm_put_minor(&dev->primary);

err_g3:

	if (dev->render)

		drm_put_minor(&dev->render);

err_g21:

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		drm_put_minor(&dev->control);

err_g2:

err_pci:

	pci_disable_device(pdev);

err_g1:

err_free:

	kfree(dev);

	mutex_unlock(&drm_global_mutex);

	return ret;

}

EXPORT_SYMBOL(drm_get_pci_dev);

drivers/gpu/drm/drm_platform.c

+3 −51
Original line number Diff line number Diff line
@@ -53,48 +53,9 @@ static int drm_get_platform_dev(struct platform_device *platdev, 


	dev->platformdev = platdev;



	mutex_lock(&drm_global_mutex);



	ret = drm_fill_in_dev(dev, NULL, driver);



	if (ret) {

		printk(KERN_ERR "DRM: Fill_in_dev failed.\n");

		goto err_g1;

	}



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);

		if (ret)

			goto err_g1;

	}



	if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {

		ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);

		if (ret)

			goto err_g11;

	}



	ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY);

	if (ret)

		goto err_g2;



	if (dev->driver->load) {

		ret = dev->driver->load(dev, 0);

	ret = drm_dev_register(dev, 0);

	if (ret)

			goto err_g3;

	}



	/* setup the grouping for the legacy output */

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = drm_mode_group_init_legacy_group(dev,

				&dev->primary->mode_group);

		if (ret)

			goto err_g3;

	}



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



	mutex_unlock(&drm_global_mutex);

		goto err_free;



	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",

		 driver->name, driver->major, driver->minor, driver->patchlevel,
@@ -102,17 +63,8 @@ static int drm_get_platform_dev(struct platform_device *platdev, 


	return 0;



err_g3:

	drm_put_minor(&dev->primary);

err_g2:

	if (dev->render)

		drm_put_minor(&dev->render);

err_g11:

	if (drm_core_check_feature(dev, DRIVER_MODESET))

		drm_put_minor(&dev->control);

err_g1:

err_free:

	kfree(dev);

	mutex_unlock(&drm_global_mutex);

	return ret;

}

drivers/gpu/drm/drm_stub.c

+82 −19
Original line number Diff line number Diff line
@@ -254,25 +254,6 @@ int drm_dropmaster_ioctl(struct drm_device *dev, void *data, 
	return 0;

}



int drm_fill_in_dev(struct drm_device *dev,

			   const struct pci_device_id *ent,

			   struct drm_driver *driver)

{

	int retcode;



	if (dev->driver->bus->agp_init) {

		retcode = dev->driver->bus->agp_init(dev);

		if (retcode) {

			drm_lastclose(dev);

			return retcode;

		}

	}



	return 0;

}

EXPORT_SYMBOL(drm_fill_in_dev);





/**

 * Get a secondary minor number.

 *
@@ -452,6 +433,8 @@ EXPORT_SYMBOL(drm_unplug_dev); 
 * @parent: Parent device object

 *

 * Allocate and initialize a new DRM device. No device registration is done.

 * Call drm_dev_register() to advertice the device to user space and register it

 * with other core subsystems.

 *

 * RETURNS:

 * Pointer to new DRM device, or NULL if out of memory.
@@ -517,3 +500,83 @@ err_free: 
	return NULL;

}

EXPORT_SYMBOL(drm_dev_alloc);



/**

 * drm_dev_register - Register DRM device

 * @dev: Device to register

 *

 * Register the DRM device @dev with the system, advertise device to user-space

 * and start normal device operation. @dev must be allocated via drm_dev_alloc()

 * previously.

 *

 * Never call this twice on any device!

 *

 * RETURNS:

 * 0 on success, negative error code on failure.

 */

int drm_dev_register(struct drm_device *dev, unsigned long flags)

{

	int ret;



	mutex_lock(&drm_global_mutex);



	if (dev->driver->bus->agp_init) {

		ret = dev->driver->bus->agp_init(dev);

		if (ret)

			goto out_unlock;

	}



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);

		if (ret)

			goto err_agp;

	}



	if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {

		ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);

		if (ret)

			goto err_control_node;

	}



	ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY);

	if (ret)

		goto err_render_node;



	if (dev->driver->load) {

		ret = dev->driver->load(dev, flags);

		if (ret)

			goto err_primary_node;

	}



	/* setup grouping for legacy outputs */

	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = drm_mode_group_init_legacy_group(dev,

				&dev->primary->mode_group);

		if (ret)

			goto err_unload;

	}



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



	ret = 0;

	goto out_unlock;



err_unload:

	if (dev->driver->unload)

		dev->driver->unload(dev);

err_primary_node:

	drm_put_minor(&dev->primary);

err_render_node:

	if (dev->render)

		drm_put_minor(&dev->render);

err_control_node:

	if (dev->control)

		drm_put_minor(&dev->control);

err_agp:

	if (dev->driver->bus->agp_destroy)

		dev->driver->bus->agp_destroy(dev);

out_unlock:

	mutex_unlock(&drm_global_mutex);

	return ret;

}

EXPORT_SYMBOL(drm_dev_register);

drivers/gpu/drm/drm_usb.c

+3 −45
Original line number Diff line number Diff line
@@ -16,45 +16,11 @@ int drm_get_usb_dev(struct usb_interface *interface, 
		return -ENOMEM;



	dev->usbdev = interface_to_usbdev(interface);



	mutex_lock(&drm_global_mutex);



	ret = drm_fill_in_dev(dev, NULL, driver);

	if (ret) {

		printk(KERN_ERR "DRM: Fill_in_dev failed.\n");

		goto err_g1;

	}



	usb_set_intfdata(interface, dev);

	ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL);

	if (ret)

		goto err_g1;



	if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {

		ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);

		if (ret)

			goto err_g11;

	}



	ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY);

	ret = drm_dev_register(dev, 0);

	if (ret)

		goto err_g2;



	if (dev->driver->load) {

		ret = dev->driver->load(dev, 0);

		if (ret)

			goto err_g3;

	}



	/* setup the grouping for the legacy output */

	ret = drm_mode_group_init_legacy_group(dev,

					       &dev->primary->mode_group);

	if (ret)

		goto err_g3;



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



	mutex_unlock(&drm_global_mutex);

		goto err_free;



	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",

		 driver->name, driver->major, driver->minor, driver->patchlevel,
@@ -62,16 +28,8 @@ int drm_get_usb_dev(struct usb_interface *interface, 


	return 0;



err_g3:

	drm_put_minor(&dev->primary);

err_g2:

	if (dev->render)

		drm_put_minor(&dev->render);

err_g11:

	drm_put_minor(&dev->control);

err_g1:

err_free:

	kfree(dev);

	mutex_unlock(&drm_global_mutex);

	return ret;



}

include/drm/drmP.h

+1 −3
Original line number Diff line number Diff line
@@ -1640,11 +1640,9 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map) 


#include <drm/drm_mem_util.h>



extern int drm_fill_in_dev(struct drm_device *dev,

			   const struct pci_device_id *ent,

			   struct drm_driver *driver);

struct drm_device *drm_dev_alloc(struct drm_driver *driver,

				 struct device *parent);

int drm_dev_register(struct drm_device *dev, unsigned long flags);

int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type);

/*@}*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE