[01/10] drm: Remove usage of deprecated DRM_INFO

  drm_print.h says DRM_INFO is deprecated.
Thus, use newer printing macros drm_info() and pr_info().

Signed-off-by: Siddh Raman Pant <code@siddh.me>
---
 drivers/gpu/drm/drm_client_modeset.c | 2 +-
 drivers/gpu/drm/drm_connector.c      | 7 ++++---
 drivers/gpu/drm/drm_drv.c            | 2 +-
 drivers/gpu/drm/drm_pci.c            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
  

On Wed, 21 Dec 2022, Siddh Raman Pant <code@siddh.me> wrote:
> drm_print.h says DRM_INFO is deprecated.
> Thus, use newer printing macros drm_info() and pr_info().

I think it's a bit odd some of the conversion is to pr_*() and some to
drm_*(NULL, ...) depending on the logging level etc.

Notably the pr_*() debugs will lack the [drm] part as well as the
function name, which makes some of the logging harder to map to what's
going on.

Maybe all of them should use the drm_*() calls, with better handling of
NULL drm device.

BR,
Jani.






>
> Signed-off-by: Siddh Raman Pant <code@siddh.me>
> ---
>  drivers/gpu/drm/drm_client_modeset.c | 2 +-
>  drivers/gpu/drm/drm_connector.c      | 7 ++++---
>  drivers/gpu/drm/drm_drv.c            | 2 +-
>  drivers/gpu/drm/drm_pci.c            | 2 +-
>  4 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
> index d553e793e673..2b76d4828c5f 100644
> --- a/drivers/gpu/drm/drm_client_modeset.c
> +++ b/drivers/gpu/drm/drm_client_modeset.c
> @@ -335,7 +335,7 @@ static bool drm_client_target_cloned(struct drm_device *dev,
>  		DRM_DEBUG_KMS("can clone using 1024x768\n");
>  		return true;
>  	}
> -	DRM_INFO("kms: can't enable cloning when we probably wanted to.\n");
> +	drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n");
>  	return false;
>  }
>  
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 547356e00341..34c26b2a974e 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -165,13 +165,14 @@ static void drm_connector_get_cmdline_mode(struct drm_connector *connector)
>  		return;
>  
>  	if (mode->force) {
> -		DRM_INFO("forcing %s connector %s\n", connector->name,
> -			 drm_get_connector_force_name(mode->force));
> +		drm_info(connector->dev, "forcing %s connector %s\n",
> +			 connector->name, drm_get_connector_force_name(mode->force));
>  		connector->force = mode->force;
>  	}
>  
>  	if (mode->panel_orientation != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) {
> -		DRM_INFO("cmdline forces connector %s panel_orientation to %d\n",
> +		drm_info(connector->dev,
> +			 "cmdline forces connector %s panel_orientation to %d\n",
>  			 connector->name, mode->panel_orientation);
>  		drm_connector_set_panel_orientation(connector,
>  						    mode->panel_orientation);
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 73b845a75d52..bc98e4bcf2c1 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -938,7 +938,7 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
>  	if (drm_core_check_feature(dev, DRIVER_MODESET))
>  		drm_modeset_register_all(dev);
>  
> -	DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
> +	drm_info(dev, "Initialized %s %d.%d.%d %s for %s on minor %d\n",
>  		 driver->name, driver->major, driver->minor,
>  		 driver->patchlevel, driver->date,
>  		 dev->dev ? dev_name(dev->dev) : "virtual device",
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 39d35fc3a43b..18cf7fa23698 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -262,7 +262,7 @@ void drm_legacy_pci_exit(const struct drm_driver *driver,
>  		}
>  		mutex_unlock(&legacy_dev_list_lock);
>  	}
> -	DRM_INFO("Module unloaded\n");
> +	pr_info("Module unloaded\n");
>  }
>  EXPORT_SYMBOL(drm_legacy_pci_exit);
  

Hi

Am 21.12.22 um 10:49 schrieb Jani Nikula:
> On Wed, 21 Dec 2022, Siddh Raman Pant <code@siddh.me> wrote:
>> drm_print.h says DRM_INFO is deprecated.
>> Thus, use newer printing macros drm_info() and pr_info().
> 
> I think it's a bit odd some of the conversion is to pr_*() and some to
> drm_*(NULL, ...) depending on the logging level etc.
> 
> Notably the pr_*() debugs will lack the [drm] part as well as the
> function name, which makes some of the logging harder to map to what's
> going on.
> 
> Maybe all of them should use the drm_*() calls, with better handling of
> NULL drm device.

That's also what I think. Something like drm_info(NULL, ) should just 
work and give the same results as before.  The older code that uses 
drm_dev_printk() seems to get it right.

Best regards
Thomas

> 
> BR,
> Jani.
> 
> 
> 
> 
> 
> 
>>
>> Signed-off-by: Siddh Raman Pant <code@siddh.me>
>> ---
>>   drivers/gpu/drm/drm_client_modeset.c | 2 +-
>>   drivers/gpu/drm/drm_connector.c      | 7 ++++---
>>   drivers/gpu/drm/drm_drv.c            | 2 +-
>>   drivers/gpu/drm/drm_pci.c            | 2 +-
>>   4 files changed, 7 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
>> index d553e793e673..2b76d4828c5f 100644
>> --- a/drivers/gpu/drm/drm_client_modeset.c
>> +++ b/drivers/gpu/drm/drm_client_modeset.c
>> @@ -335,7 +335,7 @@ static bool drm_client_target_cloned(struct drm_device *dev,
>>   		DRM_DEBUG_KMS("can clone using 1024x768\n");
>>   		return true;
>>   	}
>> -	DRM_INFO("kms: can't enable cloning when we probably wanted to.\n");
>> +	drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n");
>>   	return false;
>>   }
>>   
>> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
>> index 547356e00341..34c26b2a974e 100644
>> --- a/drivers/gpu/drm/drm_connector.c
>> +++ b/drivers/gpu/drm/drm_connector.c
>> @@ -165,13 +165,14 @@ static void drm_connector_get_cmdline_mode(struct drm_connector *connector)
>>   		return;
>>   
>>   	if (mode->force) {
>> -		DRM_INFO("forcing %s connector %s\n", connector->name,
>> -			 drm_get_connector_force_name(mode->force));
>> +		drm_info(connector->dev, "forcing %s connector %s\n",
>> +			 connector->name, drm_get_connector_force_name(mode->force));
>>   		connector->force = mode->force;
>>   	}
>>   
>>   	if (mode->panel_orientation != DRM_MODE_PANEL_ORIENTATION_UNKNOWN) {
>> -		DRM_INFO("cmdline forces connector %s panel_orientation to %d\n",
>> +		drm_info(connector->dev,
>> +			 "cmdline forces connector %s panel_orientation to %d\n",
>>   			 connector->name, mode->panel_orientation);
>>   		drm_connector_set_panel_orientation(connector,
>>   						    mode->panel_orientation);
>> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
>> index 73b845a75d52..bc98e4bcf2c1 100644
>> --- a/drivers/gpu/drm/drm_drv.c
>> +++ b/drivers/gpu/drm/drm_drv.c
>> @@ -938,7 +938,7 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags)
>>   	if (drm_core_check_feature(dev, DRIVER_MODESET))
>>   		drm_modeset_register_all(dev);
>>   
>> -	DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
>> +	drm_info(dev, "Initialized %s %d.%d.%d %s for %s on minor %d\n",
>>   		 driver->name, driver->major, driver->minor,
>>   		 driver->patchlevel, driver->date,
>>   		 dev->dev ? dev_name(dev->dev) : "virtual device",
>> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
>> index 39d35fc3a43b..18cf7fa23698 100644
>> --- a/drivers/gpu/drm/drm_pci.c
>> +++ b/drivers/gpu/drm/drm_pci.c
>> @@ -262,7 +262,7 @@ void drm_legacy_pci_exit(const struct drm_driver *driver,
>>   		}
>>   		mutex_unlock(&legacy_dev_list_lock);
>>   	}
>> -	DRM_INFO("Module unloaded\n");
>> +	pr_info("Module unloaded\n");
>>   }
>>   EXPORT_SYMBOL(drm_legacy_pci_exit);
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev