[PATCH 1/6] drm: Deduplicate driver initialization message

Daniel Vetter daniel at ffwll.ch
Wed May 17 11:41:57 UTC 2017


On Wed, May 17, 2017 at 01:06:46PM +0300, Jani Nikula wrote:
> On Fri, 30 Dec 2016, Daniel Vetter <daniel at ffwll.ch> wrote:
> > On Wed, Dec 28, 2016 at 12:32:11PM -0200, Gabriel Krisman Bertazi wrote:
> >> 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: Gabriel Krisman Bertazi <krisman at collabora.co.uk>
> >
> > Makes sense, applied to drm-misc.
> 
> Makes sense for everything except i915:
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=101025

Not sure how this happened, the i915 patch landed a few months earlier:

commit bc5ca47c0af4f949ba889e666b7da65569e36093
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Aug 25 08:23:14 2016 +0100

    drm/i915: Restore lost "Initialized i915" welcome message

Gabriel, can you pls follow up with a patch to address this?

Thanks, Daniel

> 
> BR,
> Jani.
> 
> 
> >
> > Thanks, Daniel
> >
> >> ---
> >>  drivers/gpu/drm/armada/armada_drv.c             | 6 ------
> >>  drivers/gpu/drm/drm_drv.c                       | 7 +++++++
> >>  drivers/gpu/drm/drm_pci.c                       | 4 ----
> >>  drivers/gpu/drm/drm_platform.c                  | 4 ----
> >>  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c       | 4 ----
> >>  drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 ----
> >>  drivers/gpu/drm/tegra/drm.c                     | 4 ----
> >>  drivers/gpu/drm/virtio/virtgpu_drm_bus.c        | 4 ----
> >>  8 files changed, 7 insertions(+), 30 deletions(-)
> >> 
> >> diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> >> index 07086b427c22..63f42d001f33 100644
> >> --- a/drivers/gpu/drm/armada/armada_drv.c
> >> +++ b/drivers/gpu/drm/armada/armada_drv.c
> >> @@ -203,12 +203,6 @@ static int armada_drm_bind(struct device *dev)
> >>  	armada_drm_debugfs_init(priv->drm.primary);
> >>  #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;
> >>  
> >>   err_poll:
> >> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> >> index 4a7b3e98d586..d5aeba58c2ac 100644
> >> --- a/drivers/gpu/drm/drm_drv.c
> >> +++ b/drivers/gpu/drm/drm_drv.c
> >> @@ -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)
> >>  {
> >> +	struct drm_driver *driver = dev->driver;
> >>  	int ret;
> >>  
> >>  	mutex_lock(&drm_global_mutex);
> >> @@ -758,6 +759,12 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
> >>  		drm_modeset_register_all(dev);
> >>  
> >>  	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;
> >>  
> >>  err_minors:
> >> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> >> index 3ceea9cb9d3e..dc358f860aea 100644
> >> --- a/drivers/gpu/drm/drm_pci.c
> >> +++ b/drivers/gpu/drm/drm_pci.c
> >> @@ -257,10 +257,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
> >>  	if (ret)
> >>  		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
> >>  	 * only be called from the per-driver module init hook. */
> >>  	if (drm_core_check_feature(dev, DRIVER_LEGACY))
> >> diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
> >> index 026269851ce9..7af3005a030c 100644
> >> --- a/drivers/gpu/drm/drm_platform.c
> >> +++ b/drivers/gpu/drm/drm_platform.c
> >> @@ -57,10 +57,6 @@ static int drm_get_platform_dev(struct platform_device *platdev,
> >>  	if (ret)
> >>  		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;
> >>  
> >>  err_free:
> >> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> >> index 0b35da73c2b0..9a31711d5158 100644
> >> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> >> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
> >> @@ -415,10 +415,6 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
> >>  	if (ret < 0)
> >>  		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;
> >>  
> >>  unref:
> >> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> >> index fa228b7b022c..7df0e8535e41 100644
> >> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> >> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> >> @@ -217,10 +217,6 @@ static int kirin_drm_bind(struct device *dev)
> >>  	if (ret)
> >>  		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;
> >>  
> >>  err_kms_cleanup:
> >> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> >> index e289dbc6ad82..1acf1da3f0df 100644
> >> --- a/drivers/gpu/drm/tegra/drm.c
> >> +++ b/drivers/gpu/drm/tegra/drm.c
> >> @@ -992,10 +992,6 @@ static int host1x_drm_probe(struct host1x_device *dev)
> >>  	if (err < 0)
> >>  		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;
> >>  
> >>  unref:
> >> diff --git a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
> >> index 3b97d50fd392..43e1d5916c6c 100644
> >> --- a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
> >> +++ b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
> >> @@ -83,10 +83,6 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)
> >>  	if (ret)
> >>  		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;
> >>  
> >>  err_free:
> >> -- 
> >> 2.11.0
> >> 
> >> _______________________________________________
> >> dri-devel mailing list
> >> dri-devel at lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list