mbox series

[00/10] drm: Remove usage of deprecated DRM_* macros

Message ID cover.1671566741.git.code@siddh.me
Headers
Series drm: Remove usage of deprecated DRM_* macros |

Message

Siddh Raman Pant Dec. 20, 2022, 8:16 p.m. UTC 
  This patchset aims to remove usages of deprecated DRM_* macros from the
files residing in drivers/gpu/drm root.

In process, I found out that NULL as first argument of drm_dbg_* wasn't
working, but it was listed as the alternative in deprecation comment,
so I fixed that before removing usages of DRM_DEBUG_* macros.

This patchset should be applied in order as changes might be dependent.

Please review and let me know if any errors are there, and hopefully
this gets accepted.

Siddh Raman Pant (10):
  drm: Remove usage of deprecated DRM_INFO
  drm: Remove usage of deprecated DRM_NOTE
  drm: Remove usage of deprecated DRM_ERROR
  drm/print: Fix support for NULL as first argument of drm_dbg_*
  drm: Remove usage of deprecated DRM_DEBUG
  drm: Remove usage of deprecated DRM_DEBUG_DRIVER
  drm: Remove usage of deprecated DRM_DEBUG_KMS
  drm: Remove usage of deprecated DRM_DEBUG_PRIME
  drm/drm_blend: Remove usage of deprecated DRM_DEBUG_ATOMIC
  drm/drm_lease: Remove usage of deprecated DRM_DEBUG_LEASE

 drivers/gpu/drm/drm_agpsupport.c        |   4 +-
 drivers/gpu/drm/drm_blend.c             |  13 ++-
 drivers/gpu/drm/drm_bridge.c            |   8 +-
 drivers/gpu/drm/drm_bufs.c              | 122 ++++++++++++------------
 drivers/gpu/drm/drm_client_modeset.c    | 118 +++++++++++++----------
 drivers/gpu/drm/drm_color_mgmt.c        |   4 +-
 drivers/gpu/drm/drm_connector.c         |  28 +++---
 drivers/gpu/drm/drm_context.c           |  18 ++--
 drivers/gpu/drm/drm_crtc.c              |  36 ++++---
 drivers/gpu/drm/drm_crtc_helper.c       |  62 ++++++------
 drivers/gpu/drm/drm_debugfs_crc.c       |   8 +-
 drivers/gpu/drm/drm_displayid.c         |   6 +-
 drivers/gpu/drm/drm_dma.c               |  10 +-
 drivers/gpu/drm/drm_drv.c               |  28 +++---
 drivers/gpu/drm/drm_edid.c              |  17 ++--
 drivers/gpu/drm/drm_file.c              |  18 ++--
 drivers/gpu/drm/drm_flip_work.c         |   2 +-
 drivers/gpu/drm/drm_framebuffer.c       |   3 +-
 drivers/gpu/drm/drm_gem.c               |   7 +-
 drivers/gpu/drm/drm_gem_dma_helper.c    |   6 +-
 drivers/gpu/drm/drm_gem_shmem_helper.c  |   6 +-
 drivers/gpu/drm/drm_hashtab.c           |  10 +-
 drivers/gpu/drm/drm_ioc32.c             |  13 +--
 drivers/gpu/drm/drm_ioctl.c             |  24 ++---
 drivers/gpu/drm/drm_irq.c               |   4 +-
 drivers/gpu/drm/drm_kms_helper_common.c |   2 +-
 drivers/gpu/drm/drm_lease.c             |  68 ++++++-------
 drivers/gpu/drm/drm_legacy_misc.c       |   4 +-
 drivers/gpu/drm/drm_lock.c              |  36 +++----
 drivers/gpu/drm/drm_mipi_dbi.c          |  19 ++--
 drivers/gpu/drm/drm_mm.c                |   8 +-
 drivers/gpu/drm/drm_mode_config.c       |   2 +-
 drivers/gpu/drm/drm_mode_object.c       |   6 +-
 drivers/gpu/drm/drm_modes.c             |  10 +-
 drivers/gpu/drm/drm_modeset_helper.c    |   2 +-
 drivers/gpu/drm/drm_pci.c               |  14 +--
 drivers/gpu/drm/drm_plane.c             |  46 ++++-----
 drivers/gpu/drm/drm_probe_helper.c      |  39 ++++----
 drivers/gpu/drm/drm_rect.c              |   4 +-
 drivers/gpu/drm/drm_scatter.c           |  19 ++--
 drivers/gpu/drm/drm_syncobj.c           |   2 +-
 drivers/gpu/drm/drm_sysfs.c             |  22 ++---
 drivers/gpu/drm/drm_vm.c                |  45 +++++----
 include/drm/drm_print.h                 |  91 ++++++++++++++----
 44 files changed, 549 insertions(+), 465 deletions(-)

Comments

Thomas Zimmermann Dec. 21, 2022, 9:16 a.m. UTC | #1 
Hi

Am 20.12.22 um 21:16 schrieb Siddh Raman Pant:
> This patchset aims to remove usages of deprecated DRM_* macros from the
> files residing in drivers/gpu/drm root.
> 
> In process, I found out that NULL as first argument of drm_dbg_* wasn't
> working, but it was listed as the alternative in deprecation comment,
> so I fixed that before removing usages of DRM_DEBUG_* macros.
> 
> This patchset should be applied in order as changes might be dependent.
> 
> Please review and let me know if any errors are there, and hopefully
> this gets accepted.

Thanks for the patchset. Overall this looks fine.

But the use of pr_() functions is not optimal in my opinion. I know that 
I recommended using it, but at a closer look, I think we might want to 
reconsider that. I wouldn't like losing the '[drm]' tag, but adding them 
to each pr_() call isn't a good idea either.

I think it would be nicer to replace DRM_INFO with drm_info(NULL, ). 
Depending on the device being NULL, the helpers would select dev-based 
messages or printk-based messages. It would then work like drm_dbg_(). 
But it needs some additional changes.

Can you first move all pr_() related changes into a new patchset? The 
trivial conversion were the device is known and not NULL can remain in 
this patchset and be merged soon. We can afterwards have a separate 
discussion for the changes that currently involve pr_().

Best regards
Thomas

> 
> Siddh Raman Pant (10):
>    drm: Remove usage of deprecated DRM_INFO
>    drm: Remove usage of deprecated DRM_NOTE
>    drm: Remove usage of deprecated DRM_ERROR
>    drm/print: Fix support for NULL as first argument of drm_dbg_*
>    drm: Remove usage of deprecated DRM_DEBUG
>    drm: Remove usage of deprecated DRM_DEBUG_DRIVER
>    drm: Remove usage of deprecated DRM_DEBUG_KMS
>    drm: Remove usage of deprecated DRM_DEBUG_PRIME
>    drm/drm_blend: Remove usage of deprecated DRM_DEBUG_ATOMIC
>    drm/drm_lease: Remove usage of deprecated DRM_DEBUG_LEASE
> 
>   drivers/gpu/drm/drm_agpsupport.c        |   4 +-
>   drivers/gpu/drm/drm_blend.c             |  13 ++-
>   drivers/gpu/drm/drm_bridge.c            |   8 +-
>   drivers/gpu/drm/drm_bufs.c              | 122 ++++++++++++------------
>   drivers/gpu/drm/drm_client_modeset.c    | 118 +++++++++++++----------
>   drivers/gpu/drm/drm_color_mgmt.c        |   4 +-
>   drivers/gpu/drm/drm_connector.c         |  28 +++---
>   drivers/gpu/drm/drm_context.c           |  18 ++--
>   drivers/gpu/drm/drm_crtc.c              |  36 ++++---
>   drivers/gpu/drm/drm_crtc_helper.c       |  62 ++++++------
>   drivers/gpu/drm/drm_debugfs_crc.c       |   8 +-
>   drivers/gpu/drm/drm_displayid.c         |   6 +-
>   drivers/gpu/drm/drm_dma.c               |  10 +-
>   drivers/gpu/drm/drm_drv.c               |  28 +++---
>   drivers/gpu/drm/drm_edid.c              |  17 ++--
>   drivers/gpu/drm/drm_file.c              |  18 ++--
>   drivers/gpu/drm/drm_flip_work.c         |   2 +-
>   drivers/gpu/drm/drm_framebuffer.c       |   3 +-
>   drivers/gpu/drm/drm_gem.c               |   7 +-
>   drivers/gpu/drm/drm_gem_dma_helper.c    |   6 +-
>   drivers/gpu/drm/drm_gem_shmem_helper.c  |   6 +-
>   drivers/gpu/drm/drm_hashtab.c           |  10 +-
>   drivers/gpu/drm/drm_ioc32.c             |  13 +--
>   drivers/gpu/drm/drm_ioctl.c             |  24 ++---
>   drivers/gpu/drm/drm_irq.c               |   4 +-
>   drivers/gpu/drm/drm_kms_helper_common.c |   2 +-
>   drivers/gpu/drm/drm_lease.c             |  68 ++++++-------
>   drivers/gpu/drm/drm_legacy_misc.c       |   4 +-
>   drivers/gpu/drm/drm_lock.c              |  36 +++----
>   drivers/gpu/drm/drm_mipi_dbi.c          |  19 ++--
>   drivers/gpu/drm/drm_mm.c                |   8 +-
>   drivers/gpu/drm/drm_mode_config.c       |   2 +-
>   drivers/gpu/drm/drm_mode_object.c       |   6 +-
>   drivers/gpu/drm/drm_modes.c             |  10 +-
>   drivers/gpu/drm/drm_modeset_helper.c    |   2 +-
>   drivers/gpu/drm/drm_pci.c               |  14 +--
>   drivers/gpu/drm/drm_plane.c             |  46 ++++-----
>   drivers/gpu/drm/drm_probe_helper.c      |  39 ++++----
>   drivers/gpu/drm/drm_rect.c              |   4 +-
>   drivers/gpu/drm/drm_scatter.c           |  19 ++--
>   drivers/gpu/drm/drm_syncobj.c           |   2 +-
>   drivers/gpu/drm/drm_sysfs.c             |  22 ++---
>   drivers/gpu/drm/drm_vm.c                |  45 +++++----
>   include/drm/drm_print.h                 |  91 ++++++++++++++----
>   44 files changed, 549 insertions(+), 465 deletions(-)
> 

-- 
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
Jani Nikula Dec. 21, 2022, 10:01 a.m. UTC | #2 
On Wed, 21 Dec 2022, Thomas Zimmermann <tzimmermann@suse.de> wrote:
> Hi
>
> Am 20.12.22 um 21:16 schrieb Siddh Raman Pant:
>> This patchset aims to remove usages of deprecated DRM_* macros from the
>> files residing in drivers/gpu/drm root.
>> 
>> In process, I found out that NULL as first argument of drm_dbg_* wasn't
>> working, but it was listed as the alternative in deprecation comment,
>> so I fixed that before removing usages of DRM_DEBUG_* macros.
>> 
>> This patchset should be applied in order as changes might be dependent.
>> 
>> Please review and let me know if any errors are there, and hopefully
>> this gets accepted.
>
> Thanks for the patchset. Overall this looks fine.
>
> But the use of pr_() functions is not optimal in my opinion. I know that 
> I recommended using it, but at a closer look, I think we might want to 
> reconsider that. I wouldn't like losing the '[drm]' tag, but adding them 
> to each pr_() call isn't a good idea either.
>
> I think it would be nicer to replace DRM_INFO with drm_info(NULL, ). 
> Depending on the device being NULL, the helpers would select dev-based 
> messages or printk-based messages. It would then work like drm_dbg_(). 
> But it needs some additional changes.
>
> Can you first move all pr_() related changes into a new patchset? The 
> trivial conversion were the device is known and not NULL can remain in 
> this patchset and be merged soon. We can afterwards have a separate 
> discussion for the changes that currently involve pr_().

Same thoughts, agreed.

BR,
Jani.


>
> Best regards
> Thomas
>
>> 
>> Siddh Raman Pant (10):
>>    drm: Remove usage of deprecated DRM_INFO
>>    drm: Remove usage of deprecated DRM_NOTE
>>    drm: Remove usage of deprecated DRM_ERROR
>>    drm/print: Fix support for NULL as first argument of drm_dbg_*
>>    drm: Remove usage of deprecated DRM_DEBUG
>>    drm: Remove usage of deprecated DRM_DEBUG_DRIVER
>>    drm: Remove usage of deprecated DRM_DEBUG_KMS
>>    drm: Remove usage of deprecated DRM_DEBUG_PRIME
>>    drm/drm_blend: Remove usage of deprecated DRM_DEBUG_ATOMIC
>>    drm/drm_lease: Remove usage of deprecated DRM_DEBUG_LEASE
>> 
>>   drivers/gpu/drm/drm_agpsupport.c        |   4 +-
>>   drivers/gpu/drm/drm_blend.c             |  13 ++-
>>   drivers/gpu/drm/drm_bridge.c            |   8 +-
>>   drivers/gpu/drm/drm_bufs.c              | 122 ++++++++++++------------
>>   drivers/gpu/drm/drm_client_modeset.c    | 118 +++++++++++++----------
>>   drivers/gpu/drm/drm_color_mgmt.c        |   4 +-
>>   drivers/gpu/drm/drm_connector.c         |  28 +++---
>>   drivers/gpu/drm/drm_context.c           |  18 ++--
>>   drivers/gpu/drm/drm_crtc.c              |  36 ++++---
>>   drivers/gpu/drm/drm_crtc_helper.c       |  62 ++++++------
>>   drivers/gpu/drm/drm_debugfs_crc.c       |   8 +-
>>   drivers/gpu/drm/drm_displayid.c         |   6 +-
>>   drivers/gpu/drm/drm_dma.c               |  10 +-
>>   drivers/gpu/drm/drm_drv.c               |  28 +++---
>>   drivers/gpu/drm/drm_edid.c              |  17 ++--
>>   drivers/gpu/drm/drm_file.c              |  18 ++--
>>   drivers/gpu/drm/drm_flip_work.c         |   2 +-
>>   drivers/gpu/drm/drm_framebuffer.c       |   3 +-
>>   drivers/gpu/drm/drm_gem.c               |   7 +-
>>   drivers/gpu/drm/drm_gem_dma_helper.c    |   6 +-
>>   drivers/gpu/drm/drm_gem_shmem_helper.c  |   6 +-
>>   drivers/gpu/drm/drm_hashtab.c           |  10 +-
>>   drivers/gpu/drm/drm_ioc32.c             |  13 +--
>>   drivers/gpu/drm/drm_ioctl.c             |  24 ++---
>>   drivers/gpu/drm/drm_irq.c               |   4 +-
>>   drivers/gpu/drm/drm_kms_helper_common.c |   2 +-
>>   drivers/gpu/drm/drm_lease.c             |  68 ++++++-------
>>   drivers/gpu/drm/drm_legacy_misc.c       |   4 +-
>>   drivers/gpu/drm/drm_lock.c              |  36 +++----
>>   drivers/gpu/drm/drm_mipi_dbi.c          |  19 ++--
>>   drivers/gpu/drm/drm_mm.c                |   8 +-
>>   drivers/gpu/drm/drm_mode_config.c       |   2 +-
>>   drivers/gpu/drm/drm_mode_object.c       |   6 +-
>>   drivers/gpu/drm/drm_modes.c             |  10 +-
>>   drivers/gpu/drm/drm_modeset_helper.c    |   2 +-
>>   drivers/gpu/drm/drm_pci.c               |  14 +--
>>   drivers/gpu/drm/drm_plane.c             |  46 ++++-----
>>   drivers/gpu/drm/drm_probe_helper.c      |  39 ++++----
>>   drivers/gpu/drm/drm_rect.c              |   4 +-
>>   drivers/gpu/drm/drm_scatter.c           |  19 ++--
>>   drivers/gpu/drm/drm_syncobj.c           |   2 +-
>>   drivers/gpu/drm/drm_sysfs.c             |  22 ++---
>>   drivers/gpu/drm/drm_vm.c                |  45 +++++----
>>   include/drm/drm_print.h                 |  91 ++++++++++++++----
>>   44 files changed, 549 insertions(+), 465 deletions(-)
>>
Siddh Raman Pant Dec. 21, 2022, 3:57 p.m. UTC | #3 
On Wed, Dec 21 2022 at 14:46:12 +0530, Thomas Zimmermann wrote:
> Hi
> 
> Am 20.12.22 um 21:16 schrieb Siddh Raman Pant:
>> This patchset aims to remove usages of deprecated DRM_* macros from the
>> files residing in drivers/gpu/drm root.
>>
>> In process, I found out that NULL as first argument of drm_dbg_* wasn't
>> working, but it was listed as the alternative in deprecation comment,
>> so I fixed that before removing usages of DRM_DEBUG_* macros.
>>
>> This patchset should be applied in order as changes might be dependent.
>>
>> Please review and let me know if any errors are there, and hopefully
>> this gets accepted.
> 
> Thanks for the patchset. Overall this looks fine.
> 
> But the use of pr_() functions is not optimal in my opinion. I know that
> I recommended using it, but at a closer look, I think we might want to
> reconsider that. I wouldn't like losing the '[drm]' tag, but adding them
> to each pr_() call isn't a good idea either.
> 
> I think it would be nicer to replace DRM_INFO with drm_info(NULL, ).
> Depending on the device being NULL, the helpers would select dev-based
> messages or printk-based messages. It would then work like drm_dbg_().
> But it needs some additional changes.
> 
> Can you first move all pr_() related changes into a new patchset? The
> trivial conversion were the device is known and not NULL can remain in
> this patchset and be merged soon. We can afterwards have a separate
> discussion for the changes that currently involve pr_().
> 
> Best regards
> Thomas

Maybe I can just cope for NULL in __drm_printk and change all pr_*()
changes in this patchset to the appropriate ones.

Something like:
#define __drm_printk(drm, level, type, fmt, ...)				\
({										\
	drm_ = __drm_print_dev(drm);						\
	if (drm_)								\
		dev_##level##type((drm_)->dev, "[drm] " fmt, ##__VA_ARGS__);	\
	else									\
		pr_##level##type("[drm] " fmt, ##__VA_ARGS__);			\
})

Thanks,
Siddh