Commit 75f6dfe3 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Daniel Vetter

drm: Deduplicate driver initialization message

Several DRM drivers print the same initialization message right after
drm_dev_register, so move that to common code.  The exception is i915,
which uses its own register handle, so let it keep its own message.

Notice that this was tested only with Exynos, but looks simple enough
for the other drivers.
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161228143216.26821-2-krisman@collabora.co.uk
parent e82dfa00
...@@ -203,12 +203,6 @@ static int armada_drm_bind(struct device *dev) ...@@ -203,12 +203,6 @@ static int armada_drm_bind(struct device *dev)
armada_drm_debugfs_init(priv->drm.primary); armada_drm_debugfs_init(priv->drm.primary);
#endif #endif
DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
armada_drm_driver.name, armada_drm_driver.major,
armada_drm_driver.minor, armada_drm_driver.patchlevel,
armada_drm_driver.date, dev_name(dev),
priv->drm.primary->index);
return 0; return 0;
err_poll: err_poll:
......
...@@ -728,6 +728,7 @@ static void remove_compat_control_link(struct drm_device *dev) ...@@ -728,6 +728,7 @@ static void remove_compat_control_link(struct drm_device *dev)
*/ */
int drm_dev_register(struct drm_device *dev, unsigned long flags) int drm_dev_register(struct drm_device *dev, unsigned long flags)
{ {
struct drm_driver *driver = dev->driver;
int ret; int ret;
mutex_lock(&drm_global_mutex); mutex_lock(&drm_global_mutex);
...@@ -758,6 +759,12 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) ...@@ -758,6 +759,12 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
drm_modeset_register_all(dev); drm_modeset_register_all(dev);
ret = 0; ret = 0;
DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
driver->name, driver->major, driver->minor,
driver->patchlevel, driver->date, dev_name(dev->dev),
dev->primary->index);
goto out_unlock; goto out_unlock;
err_minors: err_minors:
......
...@@ -257,10 +257,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, ...@@ -257,10 +257,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
if (ret) if (ret)
goto err_agp; goto err_agp;
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);
/* No locking needed since shadow-attach is single-threaded since it may /* No locking needed since shadow-attach is single-threaded since it may
* only be called from the per-driver module init hook. */ * only be called from the per-driver module init hook. */
if (drm_core_check_feature(dev, DRIVER_LEGACY)) if (drm_core_check_feature(dev, DRIVER_LEGACY))
......
...@@ -57,10 +57,6 @@ static int drm_get_platform_dev(struct platform_device *platdev, ...@@ -57,10 +57,6 @@ static int drm_get_platform_dev(struct platform_device *platdev,
if (ret) if (ret)
goto err_free; goto err_free;
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
driver->name, driver->major, driver->minor, driver->patchlevel,
driver->date, dev->primary->index);
return 0; return 0;
err_free: err_free:
......
...@@ -415,10 +415,6 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) ...@@ -415,10 +415,6 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
goto unref; goto unref;
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name,
driver->major, driver->minor, driver->patchlevel,
driver->date, drm->primary->index);
return 0; return 0;
unref: unref:
......
...@@ -217,10 +217,6 @@ static int kirin_drm_bind(struct device *dev) ...@@ -217,10 +217,6 @@ static int kirin_drm_bind(struct device *dev)
if (ret) if (ret)
goto err_kms_cleanup; goto err_kms_cleanup;
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
driver->name, driver->major, driver->minor, driver->patchlevel,
driver->date, drm_dev->primary->index);
return 0; return 0;
err_kms_cleanup: err_kms_cleanup:
......
...@@ -995,10 +995,6 @@ static int host1x_drm_probe(struct host1x_device *dev) ...@@ -995,10 +995,6 @@ static int host1x_drm_probe(struct host1x_device *dev)
if (err < 0) if (err < 0)
goto unref; goto unref;
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name,
driver->major, driver->minor, driver->patchlevel,
driver->date, drm->primary->index);
return 0; return 0;
unref: unref:
......
...@@ -83,10 +83,6 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev) ...@@ -83,10 +83,6 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)
if (ret) if (ret)
goto err_free; goto err_free;
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name,
driver->major, driver->minor, driver->patchlevel,
driver->date, dev->primary->index);
return 0; return 0;
err_free: err_free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment