drm: Remove usage of deprecated DRM_* macros
Subsystems (3)
v6 cover drm: Remove usage of deprecated DRM_* macros
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. Courtesy discussion on v1, I added support for NULL in drm_()* macros too.
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.
---
v5 -> v6:
- Move drm_device to default case in _Generic as it is the default behaviour.
- Fix incorrect const drm_device handling in _Generic.
- Minor positioning / comment changes.
v4 -> v5:
- Make separate function instead of using boolean in _Generic (sravn on IRC).
- Also, simplified the Generic macro, and renamed the function and macro.
v3 -> v4:
- Fix commit message for DRM_NOTE erroneously mentioning DRM_INFO.
- Rebased to drm-misc-next, as 723dad977acd added drm_dbg_core() to some files.
- Move Generic out to a separate macro __drm_get_dev_ptr, so that interface of drm_dbg_*() is also same as other drm_*() macros.
- Fix comment in __drm_get_dev_ptr (now ___drm_get_dev_ptr) to use correct name.
v2 -> v3:
- Added support for NULL in __drm_printk and thus by extension to drm_()*.
- Thus, converted dropped pr_()* changes to drm_*(NULL, ...).
- Rebased to drm-misc-next and resulting appropriate changes.
v1 -> v2:
- Removed conversions to pr_*() in DRM_INFO, DRM_NOTE, and DRM_ERROR changes.
- Due to above, DRM_NOTE usage cannot be removed and the patch is dropped.
- DRY: NULL support is now achieved by way of a separate function.
Siddh Raman Pant (10):
drm/print: Fix and add support for NULL as first argument in drm_*
macros
drm: Remove usage of deprecated DRM_INFO
drm: Remove usage of deprecated DRM_NOTE
drm: Remove usage of deprecated DRM_ERROR
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 | 26 ++--- drivers/gpu/drm/drm_edid.c | 17 ++-- 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_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_mipi_dsi.c | 12 +-- 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 | 36 +++---- 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 | 116 ++++++++++++++++------ 42 files changed, 557 insertions(+), 463 deletions(-)
Signature · 1 line
2.39.0
PATCH v6 1/10 drm/print: Fix and add support for NULL as first argument in drm_* macros
Comments say macros DRM_DEBUG_* are deprecated in favor of drm_dbg_*(NULL, ...), but they have broken support for it, as the macro will result in (NULL) ? (NULL)->dev : NULL.
Thus, fix them by separating logic to get dev ptr in a new function, which will return the dev ptr if arg is not NULL. Use it in drm_dbg_*, and also in __DRM_DEFINE_DBG_RATELIMITED, where a similar (but correct) NULL check was in place.
Also, add support for NULL in __drm_printk, so that all the drm_* macros will hence support NULL as the first argument. This also means that deprecation comments mentioning pr_()* can now be changed to the drm equivalents.
There is a need to support device pointers, as in some cases, we may not have drm_device but just the device ptr, such as when dealing with struct mipi_dsi_host. Before this change, passing just mipi_dsi_host would have worked, since due to preprocessing, the resultant would be "host->dev", but now due to NULL check that cannot happen.
--- include/drm/drm_print.h | 114 ++++++++++++++++++++++++++++++---------- 1 file changed, 87 insertions(+), 27 deletions(-)
include/drm/drm_print.h +87 -27
@@ -34,6 +34,7 @@#include <linux/dynamic_debug.h> #include <drm/drm.h> +#include <drm/drm_device.h> /* Do *not* use outside of drm_print.[ch]! */ extern unsigned long __drm_debug;
@@ -445,15 +446,73 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,#define DRM_DEV_DEBUG_KMS (dev, fmt, ...) \ drm_dev_dbg(dev, DRM_UT_KMS, fmt, ##__VA_ARGS__) +/* Helpers for struct drm_device based logging. */ + +/** +* __drm_dev_ptr - Helper function to get drm->dev pointer. +* @drm: struct drm_device pointer. +* +* RETURNS: +* The struct device pointer (NULL if @drm is NULL). +*/ +static inline struct device *__drm_dev_ptr (const struct drm_device *drm) +{ +if (drm) +return drm->dev; + +return NULL ; +} + +/** +* __dev_ptr - Helper function to get the same device pointer. +* @dev: struct device pointer, or NULL. +* +* RETURNS: +* The struct device pointer (NULL if @dev is NULL). +*/ +static inline struct device *__dev_ptr (const struct device *dev) +{ +return (struct device *)dev; +} + +/** +* __get_dev_ptr - Helper to get device pointer given struct drm_device *, +* or struct device *, or NULL. +* +* Primarily for use in drm_*() print macros, since they need to handle NULL +* as the first argument passed. +* +* struct device pointers are supported for edge cases (such as mipi_dsi_host), +* the default (and recommended) way is to pass struct drm_device pointer. +*/ +#define __get_dev_ptr (drm) \ + _Generic((drm), \ + struct device * : \ + __dev_ptr, \ + const struct device * : \ + __dev_ptr, \ + default : \ + __drm_dev_ptr \ + )(drm) +/* * struct drm_device based logging * * Prefer drm_device based logging over device or prink based logging. +* +* The below macros support device pointers to cope for edge cases where +* we only have device (like in mipi_dsi_host) but not drm_device. */ /* Helper for struct drm_device based logging. */ #define __drm_printk (drm, level, type, fmt, ...) \ - dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__) +({ \ + struct device *__dev_ = __get_dev_ptr(drm); \ + if (__dev_) \ + dev_##level##type(__dev_, "[drm] " fmt, ##__VA_ARGS__); \ + else \ + pr_##level##type("[drm] " fmt, ##__VA_ARGS__); \ +})#define drm_info (drm, fmt, ...) \
@@ -487,25 +546,25 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,#define drm_dbg_core (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_CORE, fmt, ##__VA_ARGS__) -#define drm_dbg_driver (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRIVER, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_CORE, fmt, ##__VA_ARGS__) +#define drm_dbg_driver (drm, fmt, ...) \ + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_DRIVER, fmt, ##__VA_ARGS__)#define drm_dbg_kms (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_KMS, fmt, ##__VA_ARGS__)#define drm_dbg_prime (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_PRIME, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_PRIME, fmt, ##__VA_ARGS__)#define drm_dbg_atomic (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)#define drm_dbg_vbl (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_VBL, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_VBL, fmt, ##__VA_ARGS__)#define drm_dbg_state (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_STATE, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_STATE, fmt, ##__VA_ARGS__)#define drm_dbg_lease (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_LEASE, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_LEASE, fmt, ##__VA_ARGS__)#define drm_dbg_dp (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DP, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_DP, fmt, ##__VA_ARGS__)#define drm_dbg_drmres (drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRMRES, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_DRMRES, fmt, ##__VA_ARGS__)#define drm_dbg (drm, fmt, ...) drm_dbg_driver(drm, fmt, ##__VA_ARGS__)
@@ -533,31 +592,31 @@ void __drm_err(const char *format, ...);#define _DRM_PRINTK (once, level, fmt, ...) \ printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_info(). */ +/* NOTE: this is deprecated in favor of drm_info(NULL, ...). */ #define DRM_INFO (fmt, ...) \ _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_notice(). */ +/* NOTE: this is deprecated in favor of drm_notice(NULL, ...). */ #define DRM_NOTE (fmt, ...) \ _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_warn(). */ +/* NOTE: this is deprecated in favor of drm_warn(NULL, ...). */ #define DRM_WARN (fmt, ...) \ _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_info_once(). */ +/* NOTE: this is deprecated in favor of drm_info_once(NULL, ...). */ #define DRM_INFO_ONCE (fmt, ...) \ _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_notice_once(). */ +/* NOTE: this is deprecated in favor of drm_notice_once(NULL, ...). */ #define DRM_NOTE_ONCE (fmt, ...) \ _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_warn_once(). */ +/* NOTE: this is deprecated in favor of drm_warn_once(NULL, ...). */ #define DRM_WARN_ONCE (fmt, ...) \ _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_err(). */ +/* NOTE: this is deprecated in favor of drm_err(NULL, ...). */ #define DRM_ERROR (fmt, ...) \ __drm_err(fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_err_ratelimited(). */ +/* NOTE: this is deprecated in favor of drm_err_ratelimited(NULL, ...). */ #define DRM_ERROR_RATELIMITED (fmt, ...) \ DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
@@ -593,13 +652,14 @@ void __drm_err(const char *format, ...);#define DRM_DEBUG_DP (fmt, ...) \ __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__) -#define __DRM_DEFINE_DBG_RATELIMITED (category, drm, fmt, ...) \ -({ \ - static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);\ - const struct drm_device *drm_ = (drm); \ - \ - if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_)) \ - drm_dev_printk(drm_ ? drm_->dev : NULL, KERN_DEBUG, fmt, ## __VA_ARGS__); \ +#define __DRM_DEFINE_DBG_RATELIMITED (category, drm, fmt, ...) \ +({ \ + static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, \ + DEFAULT_RATELIMIT_BURST); \ + \ + if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_))\ + drm_dev_printk(__get_dev_ptr(drm), KERN_DEBUG, \ + fmt, ## __VA_ARGS__); \ })#define drm_dbg_kms_ratelimited (drm, fmt, ...) \
Signature · 1 line
2.39.0
PATCH v6 2/10 drm: Remove usage of deprecated DRM_INFO
In reply to Siddh Raman Pantdrm_print.h says DRM_INFO is deprecated in favor of drm_info().
--- 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(-)
drivers/gpu/drm/drm_client_modeset.c +1 -1
@@ -331,7 +331,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; }
drivers/gpu/drm/drm_connector.c +4 -3
@@ -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);
drivers/gpu/drm/drm_drv.c +1 -1
@@ -901,7 +901,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",
drivers/gpu/drm/drm_pci.c +1 -1
@@ -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" ); +drm_info (NULL ,"Module unloaded\n" ); }EXPORT_SYMBOL (drm_legacy_pci_exit);
Signature · 1 line
2.39.0
PATCH v6 3/10 drm: Remove usage of deprecated DRM_NOTE
In reply to Siddh Raman Pantdrm_print.h says DRM_NOTE is deprecated in favor of drm_notice().
--- drivers/gpu/drm/drm_displayid.c | 2 +- drivers/gpu/drm/drm_kms_helper_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_displayid.c +1 -1
@@ -26,7 +26,7 @@ static int validate_displayid(const u8 *displayid, int length, int idx)for (i =0 ; i < dispid_length; i++) csum += displayid[idx + i];if (csum) { -DRM_NOTE ("DisplayID checksum invalid, remainder is %d\n" , csum); +drm_notice (NULL ,"DisplayID checksum invalid, remainder is %d\n" , csum);return -EINVAL ; }
drivers/gpu/drm/drm_kms_helper_common.c +1 -1
@@ -41,7 +41,7 @@ MODULE_LICENSE("GPL and additional rights");/* Backward compatibility for drm_kms_helper.edid_firmware */ static int edid_firmware_set (const char *val,const struct kernel_param *kp) { -DRM_NOTE ("drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n" ); +drm_notice (NULL ,"drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n" );return __drm_set_edid_firmware_path (val); }
Signature · 1 line
2.39.0
PATCH v6 4/10 drm: Remove usage of deprecated DRM_ERROR
In reply to Siddh Raman Pantdrm_print.h says DRM_ERROR is deprecated in favor of drm_err().
--- drivers/gpu/drm/drm_bridge.c | 8 ++++---- drivers/gpu/drm/drm_bufs.c | 8 ++++---- drivers/gpu/drm/drm_client_modeset.c | 4 ++-- drivers/gpu/drm/drm_context.c | 4 ++-- drivers/gpu/drm/drm_crtc_helper.c | 8 ++++---- drivers/gpu/drm/drm_debugfs_crc.c | 3 ++- drivers/gpu/drm/drm_drv.c | 14 +++++++------- drivers/gpu/drm/drm_flip_work.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 3 ++- drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_gem_dma_helper.c | 2 +- drivers/gpu/drm/drm_hashtab.c | 4 ++-- drivers/gpu/drm/drm_lock.c | 16 ++++++++-------- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- drivers/gpu/drm/drm_mipi_dsi.c | 12 ++++++------ drivers/gpu/drm/drm_mm.c | 8 ++++---- drivers/gpu/drm/drm_mode_config.c | 2 +- drivers/gpu/drm/drm_modes.c | 26 +++++++++++++------------- drivers/gpu/drm/drm_modeset_helper.c | 2 +- drivers/gpu/drm/drm_plane.c | 2 +- drivers/gpu/drm/drm_scatter.c | 9 +++++---- drivers/gpu/drm/drm_vm.c | 2 +- 22 files changed, 73 insertions(+), 70 deletions(-)
drivers/gpu/drm/drm_bridge.c +4 -4
@@ -351,11 +351,11 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge,list_del (&bridge->chain_node);#ifdef CONFIG_OF -DRM_ERROR ("failed to attach bridge %pOF to encoder %s: %d\n" , - bridge->of_node, encoder->name, ret); +drm_err (encoder->dev,"failed to attach bridge %pOF to encoder %s: %d\n" , + bridge->of_node, encoder->name, ret);#else -DRM_ERROR ("failed to attach bridge to encoder %s: %d\n" , - encoder->name, ret); +drm_err (encoder->dev,"failed to attach bridge to encoder %s: %d\n" , + encoder->name, ret);#endif return ret;
drivers/gpu/drm/drm_bufs.c +4 -4
@@ -1474,15 +1474,15 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data,if (copy_from_user (&idx, &request->list[i],sizeof (idx)))return -EFAULT ;if (idx <0 || idx >= dma->buf_count) { -DRM_ERROR ("Index %d (of %d max)\n" , - idx, dma->buf_count -1 ); +drm_err (dev,"Index %d (of %d max)\n" , + idx, dma->buf_count -1 );return -EINVAL ; } idx =array_index_nospec (idx, dma->buf_count); buf = dma->buflist[idx];if (buf->file_priv != file_priv) { -DRM_ERROR ("Process %d freeing buffer not owned\n" , -task_pid_nr (current)); +drm_err (dev,"Process %d freeing buffer not owned\n" , +task_pid_nr (current));return -EINVAL ; }drm_legacy_free_buffer (dev, buf);
drivers/gpu/drm/drm_client_modeset.c +2 -2
@@ -808,7 +808,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, offsets =kcalloc (connector_count,sizeof (*offsets),GFP_KERNEL ); enabled =kcalloc (connector_count,sizeof (bool ),GFP_KERNEL );if (!crtcs || !modes || !enabled || !offsets) { -DRM_ERROR ("Memory allocation failed\n" ); +drm_err (client->dev,"Memory allocation failed\n" ); ret = -ENOMEM ; goto out; }
@@ -832,7 +832,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, offsets, enabled, width, height) && !drm_client_target_preferred(connectors, connector_count, modes, offsets, enabled, width, height)) -DRM_ERROR ("Unable to find initial modes\n" ); +drm_err (client->dev,"Unable to find initial modes\n" );DRM_DEBUG_KMS ("picking CRTCs for %dx%d config\n" , width, height);
drivers/gpu/drm/drm_context.c +2 -2
@@ -276,7 +276,7 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,static int drm_context_switch (struct drm_device * dev,int old,int new) {if (test_and_set_bit (0 , &dev->context_flag)) { -DRM_ERROR ("Reentering -- FIXME\n" ); +drm_err (dev,"Reentering -- FIXME\n" );return -EBUSY ; }
@@ -307,7 +307,7 @@ static int drm_context_switch_complete(struct drm_device *dev, dev->last_context = new;/* PRE/POST: This is the _only_ writer. */ if (!_DRM_LOCK_IS_HELD (file_priv->master->lock.hw_lock->lock)) { -DRM_ERROR ("Lock isn't held after context switch\n" ); +drm_err (dev,"Lock isn't held after context switch\n" ); }/* If a context switch is ever initiated
drivers/gpu/drm/drm_crtc_helper.c +4 -4
@@ -768,8 +768,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set,if (!drm_crtc_helper_set_mode (set->crtc, set->mode, set->x, set->y, save_set.fb)) { -DRM_ERROR ("failed to set mode on [CRTC:%d:%s]\n" , - set->crtc->base.id, set->crtc->name); +drm_err (dev,"failed to set mode on [CRTC:%d:%s]\n" , + set->crtc->base.id, set->crtc->name); set->crtc->primary->fb = save_set.fb; ret = -EINVAL ; goto fail;
@@ -826,7 +826,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set,if (mode_changed && !drm_crtc_helper_set_mode (save_set.crtc, save_set.mode, save_set.x, save_set.y, save_set.fb)) -DRM_ERROR ("failed to restore config after modeset failure\n" ); +drm_err (dev,"failed to restore config after modeset failure\n" );kfree (save_connector_encoders);kfree (save_encoder_crtcs);
@@ -996,7 +996,7 @@ void drm_helper_resume_force_mode(struct drm_device *dev)/* Restoring the old config should never fail! */ if (ret == false) -DRM_ERROR ("failed to set mode on crtc %p\n" , crtc); +drm_err (dev,"failed to set mode on crtc %p\n" , crtc);/* Turn off outputs that were already powered off */ if (drm_helper_choose_crtc_dpms (crtc)) {
drivers/gpu/drm/drm_debugfs_crc.c +2 -1
@@ -416,7 +416,8 @@ int drm_crtc_add_crc_entry(struct drm_crtc *crtc, bool has_frame,spin_unlock_irqrestore (&crc->lock, flags);if (!was_overflow) -DRM_ERROR ("Overflow of CRC buffer, userspace reads too slow.\n" ); +drm_err (crtc->dev, +"Overflow of CRC buffer, userspace reads too slow.\n" );return -ENOBUFS ; }
drivers/gpu/drm/drm_drv.c +7 -7
@@ -163,7 +163,7 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type) ret =drm_debugfs_init (minor, minor->index, drm_debugfs_root);if (ret) { -DRM_ERROR ("DRM: Failed to initialize /sys/kernel/debug/dri.\n" ); +drm_err (dev,"DRM: Failed to initialize /sys/kernel/debug/dri.\n" ); goto err_debugfs; }
@@ -402,7 +402,7 @@ void drm_put_dev(struct drm_device *dev)DRM_DEBUG ("\n" );if (!dev) { -DRM_ERROR ("cleanup called no dev\n" ); +drm_err (NULL ,"cleanup called no dev\n" );return ; }
@@ -517,7 +517,7 @@ static struct inode *drm_fs_inode_new(void) r =simple_pin_fs (&drm_fs_type, &drm_fs_mnt, &drm_fs_cnt);if (r <0 ) { -DRM_ERROR ("Cannot mount pseudo fs: %d\n" , r); +drm_err (NULL ,"Cannot mount pseudo fs: %d\n" , r);return ERR_PTR (r); }
@@ -587,7 +587,7 @@ static int drm_dev_init(struct drm_device *dev,int ret;if (!drm_core_init_complete) { -DRM_ERROR ("DRM core is not initialized\n" ); +drm_err (NULL ,"DRM core is not initialized\n" );return -ENODEV ; }
@@ -625,7 +625,7 @@ static int drm_dev_init(struct drm_device *dev, inode =drm_fs_inode_new ();if (IS_ERR (inode)) { ret =PTR_ERR (inode); -DRM_ERROR ("Cannot allocate anonymous inode: %d\n" , ret); +drm_err (dev,"Cannot allocate anonymous inode: %d\n" , ret); goto err; }
@@ -650,7 +650,7 @@ static int drm_dev_init(struct drm_device *dev,if (drm_core_check_feature (dev,DRIVER_GEM )) { ret =drm_gem_init (dev);if (ret) { -DRM_ERROR ("Cannot initialize graphics execution manager (GEM)\n" ); +drm_err (dev,"Cannot initialize graphics execution manager (GEM)\n" ); goto err; } }
@@ -1054,7 +1054,7 @@ static int __init drm_core_init(void) ret =drm_sysfs_init ();if (ret <0 ) { -DRM_ERROR ("Cannot create DRM class: %d\n" , ret); +drm_err (NULL ,"Cannot create DRM class: %d\n" , ret); goto error; }
drivers/gpu/drm/drm_flip_work.c +1 -1
@@ -82,7 +82,7 @@ void drm_flip_work_queue(struct drm_flip_work *work, void *val)if (task) {drm_flip_work_queue_task (work, task); }else { -DRM_ERROR ("%s could not allocate task!\n" , work->name); +drm_err (NULL ,"%s could not allocate task!\n" , work->name); work->func (work, val); } }
drivers/gpu/drm/drm_framebuffer.c +2 -1
@@ -1070,7 +1070,8 @@ static void legacy_remove_fb(struct drm_framebuffer *fb)/* should turn off the crtc */ if (drm_crtc_force_disable (crtc)) -DRM_ERROR ("failed to reset crtc %p when fb was deleted\n" , crtc); +drm_err (dev,"failed to reset crtc %p when fb was deleted\n" , + crtc); } }
drivers/gpu/drm/drm_gem.c +1 -1
@@ -101,7 +101,7 @@ drm_gem_init(struct drm_device *dev) vma_offset_manager =drmm_kzalloc (dev,sizeof (*vma_offset_manager),GFP_KERNEL );if (!vma_offset_manager) { -DRM_ERROR ("out of memory\n" ); +drm_err (dev,"out of memory\n" );return -ENOMEM ; }
drivers/gpu/drm/drm_gem_dma_helper.c +1 -1
@@ -583,7 +583,7 @@ drm_gem_dma_prime_import_sg_table_vmap(struct drm_device *dev, ret =dma_buf_vmap_unlocked (attach->dmabuf, &map);if (ret) { -DRM_ERROR ("Failed to vmap PRIME buffer\n" ); +drm_err (dev,"Failed to vmap PRIME buffer\n" );return ERR_PTR (ret); }
drivers/gpu/drm/drm_hashtab.c +2 -2
@@ -53,7 +53,7 @@ int drm_ht_create(struct drm_open_hash *ht, unsigned int order)else ht->table =vzalloc (array_size (size,sizeof (*ht->table)));if (!ht->table) { -DRM_ERROR ("Out of memory for hash table\n" ); +drm_err (NULL ,"Out of memory for hash table\n" );return -ENOMEM ; }return 0 ;
@@ -157,7 +157,7 @@ int drm_ht_just_insert_please(struct drm_open_hash *ht, struct drm_hash_item *it }while (ret && (unshifted_key != first));if (ret) { -DRM_ERROR ("Available key bit space exhausted\n" ); +drm_err (NULL ,"Available key bit space exhausted\n" );return -EINVAL ; }return 0 ;
drivers/gpu/drm/drm_lock.c +8 -8
@@ -79,8 +79,8 @@ int drm_lock_take(struct drm_lock_data *lock_data,if (_DRM_LOCKING_CONTEXT (old) == context) {if (old & _DRM_LOCK_HELD) {if (context !=DRM_KERNEL_CONTEXT ) { -DRM_ERROR ("%d holds heavyweight lock\n" , - context); +drm_err (NULL ,"%d holds heavyweight lock\n" , + context); }return 0 ; }
@@ -142,8 +142,8 @@ static int drm_legacy_lock_free(struct drm_lock_data *lock_data, }while (prev != old);if (_DRM_LOCK_IS_HELD (old) &&_DRM_LOCKING_CONTEXT (old) != context) { -DRM_ERROR ("%d freed heavyweight lock held by %d\n" , - context,_DRM_LOCKING_CONTEXT (old)); +drm_err (NULL ,"%d freed heavyweight lock held by %d\n" , + context,_DRM_LOCKING_CONTEXT (old));return 1 ; }wake_up_interruptible (&lock_data->lock_queue);
@@ -175,8 +175,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data, ++file_priv->lock_count;if (lock->context ==DRM_KERNEL_CONTEXT ) { -DRM_ERROR ("Process %d using kernel context %d\n" , -task_pid_nr (current), lock->context); +drm_err (dev,"Process %d using kernel context %d\n" , +task_pid_nr (current), lock->context);return -EINVAL ; }
@@ -263,8 +263,8 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_return -EOPNOTSUPP ;if (lock->context ==DRM_KERNEL_CONTEXT ) { -DRM_ERROR ("Process %d using kernel context %d\n" , -task_pid_nr (current), lock->context); +drm_err (dev,"Process %d using kernel context %d\n" , +task_pid_nr (current), lock->context);return -EINVAL ; }
drivers/gpu/drm/drm_mipi_dbi.c +1 -1
@@ -603,7 +603,7 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev *dbidev,drm_mode_copy (&dbidev->mode, mode); ret =mipi_dbi_rotate_mode (&dbidev->mode, rotation);if (ret) { -DRM_ERROR ("Illegal rotation value %u\n" , rotation); +drm_err (drm,"Illegal rotation value %u\n" , rotation);return -EINVAL ; }
drivers/gpu/drm/drm_mipi_dsi.c +6 -6
@@ -161,13 +161,13 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)u32 reg;if (of_modalias_node (node, info.type,sizeof (info.type)) <0 ) { -drm_err (host,"modalias failure on %pOF\n" , node); +drm_err (host->dev,"modalias failure on %pOF\n" , node);return ERR_PTR (-EINVAL ); } ret =of_property_read_u32 (node,"reg" , ®);if (ret) { -drm_err (host,"device node %pOF has no valid reg property: %d\n" , +drm_err (host->dev,"device node %pOF has no valid reg property: %d\n" , node, ret);return ERR_PTR (-EINVAL ); }
@@ -205,18 +205,18 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host,int ret;if (!info) { -drm_err (host,"invalid mipi_dsi_device_info pointer\n" ); +drm_err (host->dev,"invalid mipi_dsi_device_info pointer\n" );return ERR_PTR (-EINVAL ); }if (info->channel >3 ) { -drm_err (host,"invalid virtual channel: %u\n" , info->channel); +drm_err (host->dev,"invalid virtual channel: %u\n" , info->channel);return ERR_PTR (-EINVAL ); } dsi =mipi_dsi_device_alloc (host);if (IS_ERR (dsi)) { -drm_err (host,"failed to allocate DSI device %ld\n" , +drm_err (host->dev,"failed to allocate DSI device %ld\n" ,PTR_ERR (dsi));return dsi; }
@@ -227,7 +227,7 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host, ret =mipi_dsi_device_add (dsi);if (ret) { -drm_err (host,"failed to add DSI device %d\n" , ret); +drm_err (host->dev,"failed to add DSI device %d\n" , ret);kfree (dsi);return ERR_PTR (ret); }
drivers/gpu/drm/drm_mm.c +4 -4
@@ -126,14 +126,14 @@ static void show_leaks(struct drm_mm *mm)list_for_each_entry (node,drm_mm_nodes (mm), node_list) {if (!node->stack) { -DRM_ERROR ("node [%08llx + %08llx]: unknown owner\n" , - node->start, node->size); +drm_err (NULL ,"node [%08llx + %08llx]: unknown owner\n" , + node->start, node->size);continue ; }stack_depot_snprint (node->stack, buf,BUFSZ ,0 ); -DRM_ERROR ("node [%08llx + %08llx]: inserted at\n%s" , - node->start, node->size, buf); +drm_err (NULL ,"node [%08llx + %08llx]: inserted at\n%s" , + node->start, node->size, buf); }kfree (buf);
drivers/gpu/drm/drm_mode_config.c +1 -1
@@ -513,7 +513,7 @@ void drm_mode_config_cleanup(struct drm_device *dev)if (WARN_ON (!list_empty (&dev->mode_config.connector_list))) {drm_connector_list_iter_begin (dev, &conn_iter);drm_for_each_connector_iter (connector, &conn_iter) -DRM_ERROR ("connector %s leaked!\n" , connector->name); +drm_err (dev,"connector %s leaked!\n" , connector->name);drm_connector_list_iter_end (&conn_iter); }
drivers/gpu/drm/drm_modes.c +13 -13
@@ -372,8 +372,8 @@ static int fill_analog_mode(struct drm_device *dev,if (!bt601 && (hact_duration_ns < params->hact_ns.min || hact_duration_ns > params->hact_ns.max)) { -DRM_ERROR ("Invalid horizontal active area duration: %uns (min: %u, max %u)\n" , - hact_duration_ns, params->hact_ns.min, params->hact_ns.max); +drm_err (dev,"Invalid horizontal active area duration: %uns (min: %u, max %u)\n" , + hact_duration_ns, params->hact_ns.min, params->hact_ns.max);return -EINVAL ; }
@@ -384,8 +384,8 @@ static int fill_analog_mode(struct drm_device *dev,if (!bt601 && (hblk_duration_ns < params->hblk_ns.min || hblk_duration_ns > params->hblk_ns.max)) { -DRM_ERROR ("Invalid horizontal blanking duration: %uns (min: %u, max %u)\n" , - hblk_duration_ns, params->hblk_ns.min, params->hblk_ns.max); +drm_err (dev,"Invalid horizontal blanking duration: %uns (min: %u, max %u)\n" , + hblk_duration_ns, params->hblk_ns.min, params->hblk_ns.max);return -EINVAL ; }
@@ -396,8 +396,8 @@ static int fill_analog_mode(struct drm_device *dev,if (!bt601 && (hslen_duration_ns < params->hslen_ns.min || hslen_duration_ns > params->hslen_ns.max)) { -DRM_ERROR ("Invalid horizontal sync duration: %uns (min: %u, max %u)\n" , - hslen_duration_ns, params->hslen_ns.min, params->hslen_ns.max); +drm_err (dev,"Invalid horizontal sync duration: %uns (min: %u, max %u)\n" , + hslen_duration_ns, params->hslen_ns.min, params->hslen_ns.max);return -EINVAL ; }
@@ -408,7 +408,7 @@ static int fill_analog_mode(struct drm_device *dev,if (!bt601 && (porches_duration_ns > (params->hfp_ns.max + params->hbp_ns.max) || porches_duration_ns < (params->hfp_ns.min + params->hbp_ns.min))) { -DRM_ERROR ("Invalid horizontal porches duration: %uns\n" , porches_duration_ns); +drm_err (dev,"Invalid horizontal porches duration: %uns\n" , porches_duration_ns);return -EINVAL ; }
@@ -430,8 +430,8 @@ static int fill_analog_mode(struct drm_device *dev,if (!bt601 && (hfp_duration_ns < params->hfp_ns.min || hfp_duration_ns > params->hfp_ns.max)) { -DRM_ERROR ("Invalid horizontal front porch duration: %uns (min: %u, max %u)\n" , - hfp_duration_ns, params->hfp_ns.min, params->hfp_ns.max); +drm_err (dev,"Invalid horizontal front porch duration: %uns (min: %u, max %u)\n" , + hfp_duration_ns, params->hfp_ns.min, params->hfp_ns.max);return -EINVAL ; }
@@ -442,8 +442,8 @@ static int fill_analog_mode(struct drm_device *dev,if (!bt601 && (hbp_duration_ns < params->hbp_ns.min || hbp_duration_ns > params->hbp_ns.max)) { -DRM_ERROR ("Invalid horizontal back porch duration: %uns (min: %u, max %u)\n" , - hbp_duration_ns, params->hbp_ns.min, params->hbp_ns.max); +drm_err (dev,"Invalid horizontal back porch duration: %uns (min: %u, max %u)\n" , + hbp_duration_ns, params->hbp_ns.min, params->hbp_ns.max);return -EINVAL ; }
@@ -494,8 +494,8 @@ static int fill_analog_mode(struct drm_device *dev, vtotal = vactive + vfp + vslen + vbp;if (params->num_lines != vtotal) { -DRM_ERROR ("Invalid vertical total: %upx (expected %upx)\n" , - vtotal, params->num_lines); +drm_err (dev,"Invalid vertical total: %upx (expected %upx)\n" , + vtotal, params->num_lines);return -EINVAL ; }
drivers/gpu/drm/drm_modeset_helper.c +1 -1
@@ -235,7 +235,7 @@ int drm_mode_config_helper_resume(struct drm_device *dev) ret =drm_atomic_helper_resume (dev, dev->mode_config.suspend_state);if (ret) -DRM_ERROR ("Failed to resume (%d)\n" , ret); +drm_err (dev,"Failed to resume (%d)\n" , ret); dev->mode_config.suspend_state =NULL ;drm_fb_helper_set_suspend_unlocked (dev->fb_helper,0 );
drivers/gpu/drm/drm_plane.c +1 -1
@@ -611,7 +611,7 @@ void drm_plane_force_disable(struct drm_plane *plane) plane->old_fb = plane->fb; ret = plane->funcs->disable_plane (plane,NULL );if (ret) { -DRM_ERROR ("failed to disable plane with busy fb\n" ); +drm_err (plane->dev,"failed to disable plane with busy fb\n" ); plane->old_fb =NULL ;return ; }
drivers/gpu/drm/drm_scatter.c +5 -4
@@ -170,9 +170,10 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data, j++, tmp++) {if (*tmp !=0xcafebabe && error ==0 ) { error =1 ; -DRM_ERROR ("Scatter allocation error, " -"pagelist does not match " -"virtual mapping\n" ); +drm_err (dev, +"Scatter allocation error, " +"pagelist does not match " +"virtual mapping\n" ); } } tmp =page_address (entry->pagelist[i]);
@@ -183,7 +184,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data, } }if (error ==0 ) -DRM_ERROR ("Scatter allocation matches pagelist\n" ); +drm_err (dev,"Scatter allocation matches pagelist\n" ); }#endif
drivers/gpu/drm/drm_vm.c +1 -1
@@ -547,7 +547,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)return drm_mmap_dma (filp, vma);if (drm_ht_find_item (&dev->map_hash, vma->vm_pgoff, &hash)) { -DRM_ERROR ("Could not find map\n" ); +drm_err (dev,"Could not find map\n" );return -EINVAL ; }
Signature · 1 line
2.39.0
PATCH v6 5/10 drm: Remove usage of deprecated DRM_DEBUG
In reply to Siddh Raman Pantdrm_print.h says DRM_DEBUG is deprecated in favor of drm_dbg_core().
--- drivers/gpu/drm/drm_agpsupport.c | 4 +- drivers/gpu/drm/drm_bufs.c | 114 +++++++++++++++--------------- drivers/gpu/drm/drm_context.c | 14 ++-- drivers/gpu/drm/drm_dma.c | 10 +-- drivers/gpu/drm/drm_drv.c | 10 +-- drivers/gpu/drm/drm_gem.c | 5 +- drivers/gpu/drm/drm_hashtab.c | 6 +- drivers/gpu/drm/drm_irq.c | 4 +- drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_legacy_misc.c | 4 +- drivers/gpu/drm/drm_lock.c | 20 +++--- drivers/gpu/drm/drm_mode_object.c | 6 +- drivers/gpu/drm/drm_pci.c | 12 ++-- drivers/gpu/drm/drm_plane.c | 12 ++-- drivers/gpu/drm/drm_scatter.c | 10 +-- drivers/gpu/drm/drm_syncobj.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 14 ++-- drivers/gpu/drm/drm_vm.c | 43 ++++++----- 18 files changed, 150 insertions(+), 142 deletions(-)
drivers/gpu/drm/drm_agpsupport.c +2 -2
@@ -315,8 +315,8 @@ int drm_legacy_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)if (retcode)return retcode; entry->bound = dev->agp->base + (page <<PAGE_SHIFT ); -DRM_DEBUG ("base = 0x%lx entry->bound = 0x%lx\n" , - dev->agp->base, entry->bound); +drm_dbg_core (dev,"base = 0x%lx entry->bound = 0x%lx\n" , + dev->agp->base, entry->bound);return 0 ; }EXPORT_SYMBOL (drm_legacy_agp_bind);
drivers/gpu/drm/drm_bufs.c +58 -56
252 lines not on this page · raw message
drivers/gpu/drm/drm_context.c +7 -7
@@ -280,7 +280,7 @@ static int drm_context_switch(struct drm_device * dev, int old, int new)return -EBUSY ; } -DRM_DEBUG ("Context switch from %d to %d\n" , old, new); +drm_dbg_core (dev,"Context switch from %d to %d\n" , old, new);if (new == dev->last_context) {clear_bit (0 , &dev->context_flag);
@@ -379,9 +379,9 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,/* Skip kernel's context and get a new one. */ tmp_handle =drm_legacy_ctxbitmap_next (dev); } -DRM_DEBUG ("%d\n" , tmp_handle); +drm_dbg_core (dev,"%d\n" , tmp_handle);if (tmp_handle <0 ) { -DRM_DEBUG ("Not enough free contexts.\n" ); +drm_dbg_core (dev,"Not enough free contexts.\n" );/* Should this return -EBUSY instead? */ return tmp_handle; }
@@ -390,7 +390,7 @@ int drm_legacy_addctx(struct drm_device *dev, void *data, ctx_entry =kmalloc (sizeof (*ctx_entry),GFP_KERNEL );if (!ctx_entry) { -DRM_DEBUG ("out of memory\n" ); +drm_dbg_core (dev,"out of memory\n" );return -ENOMEM ; }
@@ -449,7 +449,7 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data, !drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; -DRM_DEBUG ("%d\n" , ctx->handle); +drm_dbg_core (dev,"%d\n" , ctx->handle);return drm_context_switch (dev, dev->last_context, ctx->handle); }
@@ -473,7 +473,7 @@ int drm_legacy_newctx(struct drm_device *dev, void *data, !drm_core_check_feature(dev, DRIVER_LEGACY))return -EOPNOTSUPP ; -DRM_DEBUG ("%d\n" , ctx->handle); +drm_dbg_core (dev,"%d\n" , ctx->handle);drm_context_switch_complete (dev, file_priv, ctx->handle);return 0 ;
@@ -499,7 +499,7 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data, !drm_core_check_feature(dev, DRIVER_LEGACY))return -EOPNOTSUPP ; -DRM_DEBUG ("%d\n" , ctx->handle); +drm_dbg_core (dev,"%d\n" , ctx->handle);if (ctx->handle !=DRM_KERNEL_CONTEXT ) {if (dev->driver->context_dtor) dev->driver->context_dtor (dev, ctx->handle);
drivers/gpu/drm/drm_dma.c +5 -5
@@ -94,11 +94,11 @@ void drm_legacy_dma_takedown(struct drm_device *dev)/* Clear dma buffers */ for (i =0 ; i <=DRM_MAX_ORDER ; i++) {if (dma->bufs[i].seg_count) { -DRM_DEBUG ("order %d: buf_count = %d," -" seg_count = %d\n" , - i, - dma->bufs[i].buf_count, - dma->bufs[i].seg_count); +drm_dbg_core (dev,"order %d: buf_count = %d," +" seg_count = %d\n" , + i, + dma->bufs[i].buf_count, + dma->bufs[i].seg_count);for (j =0 ; j < dma->bufs[i].seg_count; j++) {if (dma->bufs[i].seglist[j]) { dmah = dma->bufs[i].seglist[j];
drivers/gpu/drm/drm_drv.c +5 -5
@@ -155,7 +155,7 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)unsigned long flags;int ret; -DRM_DEBUG ("\n" ); +drm_dbg_core (dev,"\n" ); minor = *drm_minor_get_slot (dev, type);if (!minor)
@@ -176,7 +176,7 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)idr_replace (&drm_minors_idr, minor, minor->index);spin_unlock_irqrestore (&drm_minor_lock, flags); -DRM_DEBUG ("new minor registered %d\n" , minor->index); +drm_dbg_core (dev,"new minor registered %d\n" , minor->index);return 0 ; err_debugfs:
@@ -399,7 +399,7 @@ void drm_minor_release(struct drm_minor *minor)*/ void drm_put_dev (struct drm_device *dev) { -DRM_DEBUG ("\n" ); +drm_dbg_core (NULL ,"\n" );if (!dev) {drm_err (NULL ,"cleanup called no dev\n" );
@@ -1004,7 +1004,7 @@ static int drm_stub_open(struct inode *inode, struct file *filp)struct drm_minor *minor;int err; -DRM_DEBUG ("\n" ); +drm_dbg_core (NULL ,"\n" ); minor =drm_minor_acquire (iminor (inode));if (IS_ERR (minor))
@@ -1068,7 +1068,7 @@ static int __init drm_core_init(void) drm_core_init_complete = true; -DRM_DEBUG ("Initialized\n" ); +drm_dbg_core (NULL ,"Initialized\n" );return 0 ; error:
drivers/gpu/drm/drm_gem.c +3 -2
@@ -712,7 +712,7 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,if (copy_from_user (handles, bo_handles, count *sizeof (u32))) { ret = -EFAULT ; -DRM_DEBUG ("Failed to copy in GEM handles\n" ); +drm_dbg_core (filp->minor->dev,"Failed to copy in GEM handles\n" ); goto out; }
@@ -767,7 +767,8 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle, obj =drm_gem_object_lookup (filep, handle);if (!obj) { -DRM_DEBUG ("Failed to look up GEM BO %d\n" , handle); +drm_dbg_core (filep->minor->dev, +"Failed to look up GEM BO %d\n" , handle);return -EINVAL ; }
drivers/gpu/drm/drm_hashtab.c +4 -2
@@ -67,10 +67,12 @@ void drm_ht_verbose_list(struct drm_open_hash *ht, unsigned long key)int count =0 ; hashed_key =hash_long (key, ht->order); -DRM_DEBUG ("Key is 0x%08lx, Hashed key is 0x%08x\n" , key, hashed_key); +drm_dbg_core (NULL ,"Key is 0x%08lx, Hashed key is 0x%08x\n" , + key, hashed_key); h_list = &ht->table[hashed_key];hlist_for_each_entry (entry, h_list, head) -DRM_DEBUG ("count %d, key: 0x%08lx\n" , count++, entry->key); +drm_dbg_core (NULL ,"count %d, key: 0x%08lx\n" , + count++, entry->key); } static struct hlist_node *drm_ht_find_key(struct drm_open_hash *ht,
drivers/gpu/drm/drm_irq.c +2 -2
@@ -78,7 +78,7 @@ static int drm_legacy_irq_install(struct drm_device *dev, int irq)return -EBUSY ; dev->irq_enabled = true; -DRM_DEBUG ("irq=%d\n" , irq); +drm_dbg_core (dev,"irq=%d\n" , irq);/* Before installing handler */ if (dev->driver->irq_preinstall)
@@ -146,7 +146,7 @@ int drm_legacy_irq_uninstall(struct drm_device *dev)if (!irq_enabled)return -EINVAL ; -DRM_DEBUG ("irq=%d\n" , dev->irq); +drm_dbg_core (dev,"irq=%d\n" , dev->irq);if (drm_core_check_feature (dev,DRIVER_LEGACY ))vga_client_unregister (to_pci_dev (dev->dev));
drivers/gpu/drm/drm_lease.c +1 -1
@@ -673,7 +673,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, count++; } -DRM_DEBUG ("lease holds %d objects\n" , count); +drm_dbg_core (dev,"lease holds %d objects\n" , count);if (ret ==0 ) arg->count_objects = count;
drivers/gpu/drm/drm_legacy_misc.c +2 -2
@@ -70,7 +70,7 @@ int drm_legacy_setup(struct drm_device * dev)return ret; -DRM_DEBUG ("\n" ); +drm_dbg_core (dev,"\n" );return 0 ; }
@@ -95,7 +95,7 @@ void drm_legacy_dev_reinit(struct drm_device *dev) dev->last_context =0 ; dev->if_version =0 ; -DRM_DEBUG ("lastclose completed\n" ); +drm_dbg_core (dev,"lastclose completed\n" ); }void drm_master_legacy_init (struct drm_master *master)
drivers/gpu/drm/drm_lock.c +10 -10
@@ -180,10 +180,10 @@ int drm_legacy_lock(struct drm_device *dev, void *data,return -EINVAL ; } -DRM_DEBUG ("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n" , - lock->context,task_pid_nr (current), - master->lock.hw_lock ? master->lock.hw_lock->lock :-1 , - lock->flags); +drm_dbg_core (dev,"%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n" , + lock->context,task_pid_nr (current), + master->lock.hw_lock ? master->lock.hw_lock->lock :-1 , + lock->flags);add_wait_queue (&master->lock.lock_queue, &entry);spin_lock_bh (&master->lock.spinlock);
@@ -219,8 +219,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data,__set_current_state (TASK_RUNNING );remove_wait_queue (&master->lock.lock_queue, &entry); -DRM_DEBUG ("%d %s\n" , lock->context, - ret ?"interrupted" :"has lock" ); +drm_dbg_core (dev,"%d %s\n" , lock->context, + ret ?"interrupted" :"has lock" );if (ret)return ret;/* don't set the block all signals on the master process for now
@@ -234,8 +234,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data,if (dev->driver->dma_quiescent && (lock->flags & _DRM_LOCK_QUIESCENT)) {if (dev->driver->dma_quiescent (dev)) { -DRM_DEBUG ("%d waiting for DMA quiescent\n" , - lock->context); +drm_dbg_core (dev,"%d waiting for DMA quiescent\n" , + lock->context);return -EBUSY ; } }
@@ -345,8 +345,8 @@ void drm_legacy_lock_release(struct drm_device *dev, struct file *filp)return ;if (drm_legacy_i_have_hw_lock (dev, file_priv)) { -DRM_DEBUG ("File %p released, freeing lock for context %d\n" , - filp,_DRM_LOCKING_CONTEXT (file_priv->master->lock.hw_lock->lock)); +drm_dbg_core (dev,"File %p released, freeing lock for context %d\n" , + filp,_DRM_LOCKING_CONTEXT (file_priv->master->lock.hw_lock->lock));drm_legacy_lock_free (&file_priv->master->lock,_DRM_LOCKING_CONTEXT (file_priv->master->lock.hw_lock->lock)); }
drivers/gpu/drm/drm_mode_object.c +4 -2
@@ -192,7 +192,8 @@ EXPORT_SYMBOL(drm_mode_object_find);void drm_mode_object_put (struct drm_mode_object *obj) {if (obj->free_cb) { -DRM_DEBUG ("OBJ ID: %d (%d)\n" , obj->id,kref_read (&obj->refcount)); +drm_dbg_core (NULL ,"OBJ ID: %d (%d)\n" , obj->id, +kref_read (&obj->refcount));kref_put (&obj->refcount, obj->free_cb); } }
@@ -209,7 +210,8 @@ EXPORT_SYMBOL(drm_mode_object_put);void drm_mode_object_get (struct drm_mode_object *obj) {if (obj->free_cb) { -DRM_DEBUG ("OBJ ID: %d (%d)\n" , obj->id,kref_read (&obj->refcount)); +drm_dbg_core (NULL ,"OBJ ID: %d (%d)\n" , obj->id, +kref_read (&obj->refcount));kref_get (&obj->refcount); } }
drivers/gpu/drm/drm_pci.c +6 -6
@@ -85,8 +85,8 @@ static int drm_legacy_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_bu p->irq = pdev->irq; -DRM_DEBUG ("%d:%d:%d => IRQ %d\n" , p->busnum, p->devnum, p->funcnum, - p->irq); +drm_dbg_core (dev,"%d:%d:%d => IRQ %d\n" , + p->busnum, p->devnum, p->funcnum, p->irq);return 0 ; }
@@ -151,12 +151,12 @@ static int drm_legacy_get_pci_dev(struct pci_dev *pdev,struct drm_device *dev;int ret; -DRM_DEBUG ("\n" ); - dev =drm_dev_alloc (driver, &pdev->dev);if (IS_ERR (dev))return PTR_ERR (dev); +drm_dbg_core (dev,"\n" ); + ret =pci_enable_device (pdev);if (ret) goto err_free;
@@ -203,7 +203,7 @@ int drm_legacy_pci_init(const struct drm_driver *driver,const struct pci_device_id *pid;int i; -DRM_DEBUG ("\n" ); +drm_dbg_core (NULL ,"\n" );if (WARN_ON (!(driver->driver_features &DRIVER_LEGACY )))return -EINVAL ;
@@ -247,7 +247,7 @@ void drm_legacy_pci_exit(const struct drm_driver *driver, {struct drm_device *dev, *tmp; -DRM_DEBUG ("\n" ); +drm_dbg_core (NULL ,"\n" );if (!(driver->driver_features &DRIVER_LEGACY )) {WARN_ON (1 );
drivers/gpu/drm/drm_plane.c +7 -5
@@ -1260,17 +1260,19 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,switch (page_flip->flags &DRM_MODE_PAGE_FLIP_TARGET ) {case DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE :if ((int )(target_vblank - current_vblank) >1 ) { -DRM_DEBUG ("Invalid absolute flip target %u, " -"must be <= %u\n" , target_vblank, - current_vblank +1 ); +drm_dbg_core (dev, +"Invalid absolute flip target %u, " +"must be <= %u\n" , target_vblank, + current_vblank +1 );drm_crtc_vblank_put (crtc);return -EINVAL ; }break ;case DRM_MODE_PAGE_FLIP_TARGET_RELATIVE :if (target_vblank !=0 && target_vblank !=1 ) { -DRM_DEBUG ("Invalid relative flip target %u, " -"must be 0 or 1\n" , target_vblank); +drm_dbg_core (dev, +"Invalid relative flip target %u, " +"must be 0 or 1\n" , target_vblank);drm_crtc_vblank_put (crtc);return -EINVAL ; }
drivers/gpu/drm/drm_scatter.c +5 -5
@@ -82,7 +82,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data,struct drm_sg_mem *entry;unsigned long pages, i, j; -DRM_DEBUG ("\n" ); +drm_dbg_core (dev,"\n" );if (!drm_core_check_feature (dev,DRIVER_LEGACY ))return -EOPNOTSUPP ;
@@ -101,7 +101,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data,return -ENOMEM ; pages = (request->size +PAGE_SIZE -1 ) /PAGE_SIZE ; -DRM_DEBUG ("size=%ld pages=%ld\n" , request->size, pages); +drm_dbg_core (dev,"size=%ld pages=%ld\n" , request->size, pages); entry->pages = pages; entry->pagelist =kcalloc (pages,sizeof (*entry->pagelist),GFP_KERNEL );
@@ -132,8 +132,8 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data, entry->handle =ScatterHandle ((unsigned long )entry->virtual); -DRM_DEBUG ("handle = %08lx\n" , entry->handle); -DRM_DEBUG ("virtual = %p\n" , entry->virtual); +drm_dbg_core (dev,"handle = %08lx\n" , entry->handle); +drm_dbg_core (dev,"virtual = %p\n" , entry->virtual);for (i = (unsigned long )entry->virtual, j =0 ; j < pages; i +=PAGE_SIZE , j++) {
@@ -213,7 +213,7 @@ int drm_legacy_sg_free(struct drm_device *dev, void *data,if (!entry || entry->handle != request->handle)return -EINVAL ; -DRM_DEBUG ("virtual = %p\n" , entry->virtual); +drm_dbg_core (dev,"virtual = %p\n" , entry->virtual);drm_sg_cleanup (entry);
drivers/gpu/drm/drm_syncobj.c +1 -1
@@ -298,7 +298,7 @@ void drm_syncobj_add_point(struct drm_syncobj *syncobj, prev =drm_syncobj_fence_get (syncobj);/* You are adding an unorder point to timeline, which could cause payload returned from query_ioctl is 0! */ if (prev && prev->seqno >= point) -DRM_DEBUG ("You are adding an unorder point to timeline!\n" ); +drm_dbg_core (NULL ,"You are adding an unorder point to timeline!\n" );dma_fence_chain_init (chain, prev, fence, point);rcu_assign_pointer (syncobj->fence, &chain->base);
drivers/gpu/drm/drm_sysfs.c +7 -7
@@ -341,8 +341,8 @@ int drm_sysfs_connector_add(struct drm_connector *connector)if (r) goto err_free; -DRM_DEBUG ("adding \"%s\" to sysfs\n" , - connector->name); +drm_dbg_core (dev,"adding \"%s\" to sysfs\n" , + connector->name); r =device_add (kdev);if (r) {
@@ -370,8 +370,8 @@ void drm_sysfs_connector_remove(struct drm_connector *connector)if (connector->ddc)sysfs_remove_link (&connector->kdev->kobj,"ddc" ); -DRM_DEBUG ("removing \"%s\" from sysfs\n" , - connector->name); +drm_dbg_core (connector->dev,"removing \"%s\" from sysfs\n" , + connector->name);device_unregister (connector->kdev); connector->kdev =NULL ;
@@ -382,7 +382,7 @@ void drm_sysfs_lease_event(struct drm_device *dev)char *event_string ="LEASE=1" ;char *envp[] = { event_string,NULL }; -DRM_DEBUG ("generating lease event\n" ); +drm_dbg_core (dev,"generating lease event\n" );kobject_uevent_env (&dev->primary->kdev->kobj,KOBJ_CHANGE , envp); }
@@ -403,7 +403,7 @@ void drm_sysfs_hotplug_event(struct drm_device *dev)char *event_string ="HOTPLUG=1" ;char *envp[] = { event_string,NULL }; -DRM_DEBUG ("generating hotplug event\n" ); +drm_dbg_core (dev,"generating hotplug event\n" );kobject_uevent_env (&dev->primary->kdev->kobj,KOBJ_CHANGE , envp); }
@@ -459,7 +459,7 @@ void drm_sysfs_connector_status_event(struct drm_connector *connector,snprintf (prop_id,ARRAY_SIZE (prop_id),"PROPERTY=%u" , property->base.id); -DRM_DEBUG ("generating connector status event\n" ); +drm_dbg_core (dev,"generating connector status event\n" );kobject_uevent_env (&dev->primary->kdev->kobj,KOBJ_CHANGE , envp); }
drivers/gpu/drm/drm_vm.c +21 -22
97 lines not on this page · raw message
Signature · 1 line
2.39.0
PATCH v6 6/10 drm: Remove usage of deprecated DRM_DEBUG_DRIVER
In reply to Siddh Raman Pantdrm_print.h says DRM_DEBUG_DRIVER is deprecated.
Thus, use newer drm_dbg_driver().
Also fix the deprecation comment in drm_print.h which mentions drm_dbg() instead of drm_dbg_driver().
--- drivers/gpu/drm/drm_mipi_dbi.c | 10 +++++----- include/drm/drm_print.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_mipi_dbi.c +5 -5
@@ -70,11 +70,11 @@#define MIPI_DBI_DEBUG_COMMAND (cmd, data, len) \ ({ \ if (!len) \ - DRM_DEBUG_DRIVER("cmd=%02x\n", cmd); \ + drm_dbg_driver(NULL, "cmd=%02x\n", cmd); \ else if (len <= 32) \ - DRM_DEBUG_DRIVER("cmd=%02x, par=%*ph\n", cmd, (int)len, data);\ + drm_dbg_driver(NULL, "cmd=%02x, par=%*ph\n", cmd, (int)len, data);\ else \ - DRM_DEBUG_DRIVER("cmd=%02x, len=%zu\n", cmd, len); \ + drm_dbg_driver(NULL, "cmd=%02x, len=%zu\n", cmd, len); \ })static const u8 mipi_dbi_dcs_read_commands[] = {
@@ -708,7 +708,7 @@ bool mipi_dbi_display_is_on(struct mipi_dbi *dbi) DCS_POWER_MODE_DISPLAY_NORMAL_MODE | DCS_POWER_MODE_SLEEP_MODE))return false; -DRM_DEBUG_DRIVER ("Display is ON\n" ); +drm_dbg_driver (NULL ,"Display is ON\n" );return true; }
@@ -1256,7 +1256,7 @@ int mipi_dbi_spi_init(struct spi_device *spi, struct mipi_dbi *dbi,mutex_init (&dbi->cmdlock); -DRM_DEBUG_DRIVER ("SPI speed: %uMHz\n" , spi->max_speed_hz /1000000 ); +drm_dbg_driver (NULL ,"SPI speed: %uMHz\n" , spi->max_speed_hz /1000000 );return 0 ; }
include/drm/drm_print.h +1 -1
@@ -624,7 +624,7 @@ void __drm_err(const char *format, ...);#define DRM_DEBUG (fmt, ...) \ __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of drm_dbg(NULL, ...). */ +/* NOTE: this is deprecated in favor of drm_dbg_driver(NULL, ...). */ #define DRM_DEBUG_DRIVER (fmt, ...) \ __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
Signature · 1 line
2.39.0
PATCH v6 7/10 drm: Remove usage of deprecated DRM_DEBUG_KMS
In reply to Siddh Raman Pantdrm_print.h says DRM_DEBUG_KMS is deprecated in favor of drm_dbg_kms().
--- drivers/gpu/drm/drm_client_modeset.c | 112 ++++++++++++++----------- drivers/gpu/drm/drm_color_mgmt.c | 4 +- drivers/gpu/drm/drm_connector.c | 21 ++--- drivers/gpu/drm/drm_crtc.c | 36 ++++---- drivers/gpu/drm/drm_crtc_helper.c | 54 ++++++------ drivers/gpu/drm/drm_debugfs_crc.c | 5 +- drivers/gpu/drm/drm_displayid.c | 4 +- drivers/gpu/drm/drm_edid.c | 17 ++-- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +- drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_mipi_dbi.c | 7 +- drivers/gpu/drm/drm_modes.c | 10 +-- drivers/gpu/drm/drm_plane.c | 32 +++---- drivers/gpu/drm/drm_probe_helper.c | 39 ++++----- drivers/gpu/drm/drm_rect.c | 4 +- drivers/gpu/drm/drm_sysfs.c | 8 +- 16 files changed, 189 insertions(+), 170 deletions(-)
drivers/gpu/drm/drm_client_modeset.c +64 -48
@@ -242,8 +242,9 @@ static void drm_client_connectors_enabled(struct drm_connector **connectors,for (i =0 ; i < connector_count; i++) { connector = connectors[i]; enabled[i] =drm_connector_enabled (connector, true); -DRM_DEBUG_KMS ("connector %d enabled? %s\n" , connector->base.id, - connector->display_info.non_desktop ?"non desktop" :str_yes_no (enabled[i])); +drm_dbg_kms (connector->dev,"connector %d enabled? %s\n" , + connector->base.id, + connector->display_info.non_desktop ?"non desktop" :str_yes_no (enabled[i])); any_enabled |= enabled[i]; }
@@ -303,7 +304,7 @@ static bool drm_client_target_cloned(struct drm_device *dev, }if (can_clone) { -DRM_DEBUG_KMS ("can clone using command line\n" ); +drm_dbg_kms (dev,"can clone using command line\n" );return true; }
@@ -328,7 +329,7 @@ static bool drm_client_target_cloned(struct drm_device *dev, }if (can_clone) { -DRM_DEBUG_KMS ("can clone using 1024x768\n" ); +drm_dbg_kms (dev,"can clone using 1024x768\n" );return true; }drm_info (dev,"kms: can't enable cloning when we probably wanted to.\n" );
@@ -352,8 +353,9 @@ static int drm_client_get_tile_offsets(struct drm_connector **connectors,continue ;if (!modes[i] && (h_idx || v_idx)) { -DRM_DEBUG_KMS ("no modes for connector tiled %d %d\n" , i, - connector->base.id); +drm_dbg_kms (connector->dev, +"no modes for connector tiled %d %d\n" , + i, connector->base.id);continue ; }if (connector->tile_h_loc < h_idx)
@@ -364,7 +366,8 @@ static int drm_client_get_tile_offsets(struct drm_connector **connectors, } offsets[idx].x = hoffset; offsets[idx].y = voffset; -DRM_DEBUG_KMS ("returned %d %d for %d %d\n" , hoffset, voffset, h_idx, v_idx); +drm_dbg_kms (NULL ,"returned %d %d for %d %d\n" , + hoffset, voffset, h_idx, v_idx);return 0 ; }
@@ -421,14 +424,16 @@ static bool drm_client_target_preferred(struct drm_connector **connectors,drm_client_get_tile_offsets (connectors, connector_count, modes, offsets, i, connector->tile_h_loc, connector->tile_v_loc); } -DRM_DEBUG_KMS ("looking for cmdline mode on connector %d\n" , - connector->base.id); +drm_dbg_kms (connector->dev, +"looking for cmdline mode on connector %d\n" , + connector->base.id);/* got for command line mode first */ modes[i] =drm_connector_pick_cmdline_mode (connector);if (!modes[i]) { -DRM_DEBUG_KMS ("looking for preferred mode on connector %d %d\n" , - connector->base.id, connector->tile_group ? connector->tile_group->id :0 ); +drm_dbg_kms (connector->dev, +"looking for preferred mode on connector %d %d\n" , + connector->base.id, connector->tile_group ? connector->tile_group->id :0 ); modes[i] =drm_connector_has_preferred_mode (connector, width, height); }/* No preferred modes, pick one off the list */
@@ -450,16 +455,17 @@ static bool drm_client_target_preferred(struct drm_connector **connectors, (connector->tile_h_loc == 0 && connector->tile_v_loc == 0 && !drm_connector_get_tiled_mode(connector))) { - DRM_DEBUG_KMS("Falling back to non tiled mode on Connector %d\n", - connector->base.id); + drm_dbg_kms(connector->dev, + "Falling back to non tiled mode on Connector %d\n", + connector->base.id); modes[i] = drm_connector_fallback_non_tiled_mode(connector); } else { modes[i] =drm_connector_get_tiled_mode (connector); } } -DRM_DEBUG_KMS ("found mode %s\n" , modes[i] ? modes[i]->name : -"none" ); +drm_dbg_kms (connector->dev,"found mode %s\n" , + modes[i] ? modes[i]->name :"none" ); conn_configured |=BIT_ULL (i); }
@@ -619,15 +625,17 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, num_connectors_detected++;if (!enabled[i]) { -DRM_DEBUG_KMS ("connector %s not enabled, skipping\n" , - connector->name); +drm_dbg_kms (connector->dev, +"connector %s not enabled, skipping\n" , + connector->name); conn_configured |=BIT (i);continue ; }if (connector->force ==DRM_FORCE_OFF ) { -DRM_DEBUG_KMS ("connector %s is disabled by user, skipping\n" , - connector->name); +drm_dbg_kms (connector->dev, +"connector %s is disabled by user, skipping\n" , + connector->name); enabled[i] = false;continue ; }
@@ -637,8 +645,9 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,if (connector->force >DRM_FORCE_OFF ) goto bail; -DRM_DEBUG_KMS ("connector %s has no encoder or crtc, skipping\n" , - connector->name); +drm_dbg_kms (connector->dev, +"connector %s has no encoder or crtc, skipping\n" , + connector->name); enabled[i] = false; conn_configured |=BIT (i);continue ;
@@ -655,28 +664,32 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,*/ for (j =0 ; j < count; j++) {if (crtcs[j] == new_crtc) { -DRM_DEBUG_KMS ("fallback: cloned configuration\n" ); +drm_dbg_kms (connector->dev, +"fallback: cloned configuration\n" ); goto bail; } } -DRM_DEBUG_KMS ("looking for cmdline mode on connector %s\n" , - connector->name); +drm_dbg_kms (connector->dev, +"looking for cmdline mode on connector %s\n" , + connector->name);/* go for command line mode first */ modes[i] =drm_connector_pick_cmdline_mode (connector);/* try for preferred next */ if (!modes[i]) { -DRM_DEBUG_KMS ("looking for preferred mode on connector %s %d\n" , - connector->name, connector->has_tile); +drm_dbg_kms (connector->dev, +"looking for preferred mode on connector %s %d\n" , + connector->name, connector->has_tile); modes[i] =drm_connector_has_preferred_mode (connector, width, height); }/* No preferred mode marked by the EDID? Are there any modes? */ if (!modes[i] && !list_empty (&connector->modes)) { -DRM_DEBUG_KMS ("using first mode listed on connector %s\n" , - connector->name); +drm_dbg_kms (connector->dev, +"using first mode listed on connector %s\n" , + connector->name); modes[i] =list_first_entry (&connector->modes, struct drm_display_mode, head);
@@ -695,8 +708,9 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,* This is crtc->mode and not crtc->state->mode for the * fastboot check to work correctly. */ -DRM_DEBUG_KMS ("looking for current mode on connector %s\n" , - connector->name); +drm_dbg_kms (connector->dev, +"looking for current mode on connector %s\n" , + connector->name); modes[i] = &connector->state->crtc->mode; }/*
@@ -705,18 +719,20 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,*/ if (connector->has_tile && num_tiled_conns < connector->num_h_tile * connector->num_v_tile) { -DRM_DEBUG_KMS ("Falling back to non tiled mode on Connector %d\n" , - connector->base.id); +drm_dbg_kms (connector->dev, +"Falling back to non tiled mode on Connector %d\n" , + connector->base.id); modes[i] =drm_connector_fallback_non_tiled_mode (connector); } crtcs[i] = new_crtc; -DRM_DEBUG_KMS ("connector %s on [CRTC:%d:%s]: %dx%d%s\n" , - connector->name, - connector->state->crtc->base.id, - connector->state->crtc->name, - modes[i]->hdisplay, modes[i]->vdisplay, - modes[i]->flags &DRM_MODE_FLAG_INTERLACE ?"i" :"" ); +drm_dbg_kms (connector->dev, +"connector %s on [CRTC:%d:%s]: %dx%d%s\n" , + connector->name, + connector->state->crtc->base.id, + connector->state->crtc->name, + modes[i]->hdisplay, modes[i]->vdisplay, + modes[i]->flags &DRM_MODE_FLAG_INTERLACE ?"i" :"" ); fallback = false; conn_configured |=BIT (i);
@@ -732,15 +748,15 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,*/ if (num_connectors_enabled != num_connectors_detected && num_connectors_enabled < dev->mode_config.num_crtc) { -DRM_DEBUG_KMS ("fallback: Not all outputs enabled\n" ); -DRM_DEBUG_KMS ("Enabled: %i, detected: %i\n" , num_connectors_enabled, - num_connectors_detected); +drm_dbg_kms (NULL ,"fallback: Not all outputs enabled\n" ); +drm_dbg_kms (NULL ,"Enabled: %i, detected: %i\n" , + num_connectors_enabled, num_connectors_detected); fallback = true; }if (fallback) { bail: -DRM_DEBUG_KMS ("Not using firmware configuration\n" ); +drm_dbg_kms (NULL ,"Not using firmware configuration\n" );memcpy (enabled, save_enabled, count); ret = false; }
@@ -777,7 +793,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,int i, ret =0 ;bool *enabled; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (dev,"\n" );if (!width) width = dev->mode_config.max_width;
@@ -819,7 +835,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,for (i =0 ; i < connector_count; i++) total_modes_count += connectors[i]->funcs->fill_modes (connectors[i], width, height);if (!total_modes_count) -DRM_DEBUG_KMS ("No connectors reported connected with modes\n" ); +drm_dbg_kms (dev,"No connectors reported connected with modes\n" );drm_client_connectors_enabled (connectors, connector_count, enabled); if (!drm_client_firmware_config(client, connectors, connector_count, crtcs,
@@ -834,8 +850,8 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, offsets, enabled, width, height))drm_err (client->dev,"Unable to find initial modes\n" ); -DRM_DEBUG_KMS ("picking CRTCs for %dx%d config\n" , - width, height); +drm_dbg_kms (dev,"picking CRTCs for %dx%d config\n" , + width, height);drm_client_pick_crtcs (client, connectors, connector_count, crtcs, modes,0 , width, height);
@@ -853,8 +869,8 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,struct drm_mode_set *modeset =drm_client_find_modeset (client, crtc);struct drm_connector *connector = connectors[i]; -DRM_DEBUG_KMS ("desired mode %s set on crtc %d (%d,%d)\n" , - mode->name, crtc->base.id, offset->x, offset->y); +drm_dbg_kms (dev,"desired mode %s set on crtc %d (%d,%d)\n" , + mode->name, crtc->base.id, offset->x, offset->y);if (WARN_ON_ONCE (modeset->num_connectors ==DRM_CLIENT_MAX_CLONED_CONNECTORS || (dev->mode_config.num_crtc >1 && modeset->num_connectors ==1 ))) {
drivers/gpu/drm/drm_color_mgmt.c +2 -2
@@ -612,7 +612,7 @@ int drm_color_lut_check(const struct drm_property_blob *lut, u32 tests)if (tests &DRM_COLOR_LUT_EQUAL_CHANNELS ) {if (entry[i].red != entry[i].blue || entry[i].red != entry[i].green) { -DRM_DEBUG_KMS ("All LUT entries must have equal r/g/b\n" ); +drm_dbg_kms (NULL ,"All LUT entries must have equal r/g/b\n" );return -EINVAL ; } }
@@ -621,7 +621,7 @@ int drm_color_lut_check(const struct drm_property_blob *lut, u32 tests)if (entry[i].red < entry[i -1 ].red || entry[i].green < entry[i -1 ].green || entry[i].blue < entry[i -1 ].blue) { -DRM_DEBUG_KMS ("LUT entries must never decrease.\n" ); +drm_dbg_kms (NULL ,"LUT entries must never decrease.\n" );return -EINVAL ; } }
drivers/gpu/drm/drm_connector.c +11 -10
@@ -178,13 +178,14 @@ static void drm_connector_get_cmdline_mode(struct drm_connector *connector) mode->panel_orientation); } -DRM_DEBUG_KMS ("cmdline mode for connector %s %s %dx%d@%dHz%s%s%s\n" , - connector->name, mode->name, - mode->xres, mode->yres, - mode->refresh_specified ? mode->refresh :60 , - mode->rb ?" reduced blanking" :"" , - mode->margins ?" with margins" :"" , - mode->interlace ?" interlaced" :"" ); +drm_dbg_kms (connector->dev, +"cmdline mode for connector %s %s %dx%d@%dHz%s%s%s\n" , + connector->name, mode->name, + mode->xres, mode->yres, + mode->refresh_specified ? mode->refresh :60 , + mode->rb ?" reduced blanking" :"" , + mode->margins ?" with margins" :"" , + mode->interlace ?" interlaced" :"" ); }static void drm_connector_free (struct kref *kref)
@@ -244,9 +245,9 @@ static int __drm_connector_init(struct drm_device *dev,/* connector index is used with 32bit bitmasks */ ret =ida_alloc_max (&config->connector_ida,31 ,GFP_KERNEL );if (ret <0 ) { -DRM_DEBUG_KMS ("Failed to allocate %s connector index: %d\n" , - drm_connector_enum_list[connector_type].name, - ret); +drm_dbg_kms (dev,"Failed to allocate %s connector index: %d\n" , + drm_connector_enum_list[connector_type].name, + ret); goto out_put; } connector->index = ret;
drivers/gpu/drm/drm_crtc.c +17 -19
@@ -730,10 +730,10 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, crtc =drm_crtc_find (dev, file_priv, crtc_req->crtc_id);if (!crtc) { -DRM_DEBUG_KMS ("Unknown CRTC ID %d\n" , crtc_req->crtc_id); +drm_dbg_kms (dev,"Unknown CRTC ID %d\n" , crtc_req->crtc_id);return -ENOENT ; } -DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.id, crtc->name); +drm_dbg_kms (dev,"[CRTC:%d:%s]\n" , crtc->base.id, crtc->name); plane = crtc->primary;
@@ -756,7 +756,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, old_fb = plane->fb;if (!old_fb) { -DRM_DEBUG_KMS ("CRTC doesn't have current FB\n" ); +drm_dbg_kms (dev,"CRTC doesn't have current FB\n" ); ret = -EINVAL ; goto out; }
@@ -767,8 +767,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, }else { fb =drm_framebuffer_lookup (dev, file_priv, crtc_req->fb_id);if (!fb) { -DRM_DEBUG_KMS ("Unknown FB ID%d\n" , - crtc_req->fb_id); +drm_dbg_kms (dev,"Unknown FB ID%d\n" , crtc_req->fb_id); ret = -ENOENT ; goto out; }
@@ -781,7 +780,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, }if (!file_priv->aspect_ratio_allowed && (crtc_req->mode.flags &DRM_MODE_FLAG_PIC_AR_MASK ) !=DRM_MODE_FLAG_PIC_AR_NONE ) { -DRM_DEBUG_KMS ("Unexpected aspect-ratio flag bits\n" ); +drm_dbg_kms (dev,"Unexpected aspect-ratio flag bits\n" ); ret = -EINVAL ; goto out; }
@@ -789,8 +788,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, ret =drm_mode_convert_umode (dev, mode, &crtc_req->mode);if (ret) { -DRM_DEBUG_KMS ("Invalid mode (ret=%d, status=%s)\n" , - ret,drm_get_mode_status_name (mode->status)); +drm_dbg_kms (dev,"Invalid mode (ret=%d, status=%s)\n" , + ret,drm_get_mode_status_name (mode->status));drm_mode_debug_printmodeline (mode); goto out; }
@@ -807,9 +806,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, fb->format->format, fb->modifier);if (ret) { -DRM_DEBUG_KMS ("Invalid pixel format %p4cc, modifier 0x%llx\n" , - &fb->format->format, - fb->modifier); +drm_dbg_kms (dev,"Invalid pixel format %p4cc, modifier 0x%llx\n" , + &fb->format->format, fb->modifier); goto out; } }
@@ -822,14 +820,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, }if (crtc_req->count_connectors ==0 && mode) { -DRM_DEBUG_KMS ("Count connectors is 0 but mode set\n" ); +drm_dbg_kms (dev,"Count connectors is 0 but mode set\n" ); ret = -EINVAL ; goto out; }if (crtc_req->count_connectors >0 && (!mode || !fb)) { -DRM_DEBUG_KMS ("Count connectors is %d but no mode or fb set\n" , - crtc_req->count_connectors); +drm_dbg_kms (dev,"Count connectors is %d but no mode or fb set\n" , + crtc_req->count_connectors); ret = -EINVAL ; goto out; }
@@ -861,14 +859,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, connector =drm_connector_lookup (dev, file_priv, out_id);if (!connector) { -DRM_DEBUG_KMS ("Connector id %d unknown\n" , - out_id); +drm_dbg_kms (dev,"Connector id %d unknown\n" , + out_id); ret = -ENOENT ; goto out; } -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s]\n" , - connector->base.id, - connector->name); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s]\n" , + connector->base.id, + connector->name); connector_set[i] = connector; }
drivers/gpu/drm/drm_crtc_helper.c +27 -27
136 lines not on this page · raw message
drivers/gpu/drm/drm_debugfs_crc.c +3 -2
@@ -131,8 +131,9 @@ static ssize_t crc_control_write(struct file *file, const char __user *ubuf,return 0 ;if (len >PAGE_SIZE -1 ) { -DRM_DEBUG_KMS ("Expected < %lu bytes into crtc crc control\n" , -PAGE_SIZE ); +drm_dbg_kms (crtc->dev, +"Expected < %lu bytes into crtc crc control\n" , +PAGE_SIZE );return -E2BIG ; }
drivers/gpu/drm/drm_displayid.c +2 -2
@@ -15,8 +15,8 @@ static int validate_displayid(const u8 *displayid, int length, int idx) base = (const struct displayid_header *)&displayid[idx]; -DRM_DEBUG_KMS ("base revision 0x%x, length %d, %d %d\n" , - base->rev, base->bytes, base->prod_id, base->ext_count); +drm_dbg_kms (NULL ,"base revision 0x%x, length %d, %d %d\n" , + base->rev, base->bytes, base->prod_id, base->ext_count);/* +1 for DispID checksum */ dispid_length =sizeof (*base) + base->bytes +1 ;
drivers/gpu/drm/drm_edid.c +9 -8
@@ -1987,7 +1987,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, bool print_bad_edid, status =edid_block_check (block, is_base_block);if (status ==EDID_BLOCK_HEADER_REPAIR ) { -DRM_DEBUG_KMS ("Fixing EDID header, your hardware may be failing\n" ); +drm_dbg_kms (NULL ,"Fixing EDID header, your hardware may be failing\n" );edid_header_fix (block);/* Retry with fixed header, update status if that worked. */
@@ -2173,8 +2173,9 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned int block, size_t len) ret =i2c_transfer (adapter, &msgs[3 - xfers], xfers);if (ret == -ENXIO ) { -DRM_DEBUG_KMS ("drm: skipping non-existent adapter %s\n" , - adapter->name); +drm_dbg_kms (NULL , +"drm: skipping non-existent adapter %s\n" , + adapter->name);break ; } }while (ret != xfers && --retries);
@@ -5629,7 +5630,7 @@ static int _drm_edid_to_sad(const struct drm_edid *drm_edid, }cea_db_iter_end (&iter); -DRM_DEBUG_KMS ("Found %d Short Audio Descriptors\n" , count); +drm_dbg_kms (NULL ,"Found %d Short Audio Descriptors\n" , count);return count; }
@@ -5674,7 +5675,7 @@ static int _drm_edid_to_speaker_allocation(const struct drm_edid *drm_edid, }cea_db_iter_end (&iter); -DRM_DEBUG_KMS ("Found %d Speaker Allocation Data Blocks\n" , count); +drm_dbg_kms (NULL ,"Found %d Speaker Allocation Data Blocks\n" , count);return count; }
@@ -5801,7 +5802,7 @@ static bool _drm_detect_monitor_audio(const struct drm_edid *drm_edid)drm_edid_iter_end (&edid_iter);if (has_audio) { -DRM_DEBUG_KMS ("Monitor has basic audio support\n" ); +drm_dbg_kms (NULL ,"Monitor has basic audio support\n" ); goto end; }
@@ -5812,8 +5813,8 @@ static bool _drm_detect_monitor_audio(const struct drm_edid *drm_edid)int i;for (i =0 ; i <cea_db_payload_len (db); i +=3 ) -DRM_DEBUG_KMS ("CEA audio format %d\n" , - (data[i] >>3 ) &0xf ); +drm_dbg_kms (NULL ,"CEA audio format %d\n" , + (data[i] >>3 ) &0xf ); has_audio = true;break ; }
drivers/gpu/drm/drm_gem_shmem_helper.c +2 -2
@@ -175,7 +175,7 @@ static int drm_gem_shmem_get_pages_locked(struct drm_gem_shmem_object *shmem) pages =drm_gem_get_pages (obj);if (IS_ERR (pages)) { -DRM_DEBUG_KMS ("Failed to get pages (%ld)\n" ,PTR_ERR (pages)); +drm_dbg_kms (NULL ,"Failed to get pages (%ld)\n" ,PTR_ERR (pages)); shmem->pages_use_count =0 ;return PTR_ERR (pages); }
@@ -328,7 +328,7 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, }if (ret) { -DRM_DEBUG_KMS ("Failed to vmap pages, error %d\n" , ret); +drm_dbg_kms (NULL ,"Failed to vmap pages, error %d\n" , ret); goto err_put_pages; }
drivers/gpu/drm/drm_lease.c +1 -1
@@ -400,7 +400,7 @@ static int fill_object_idr(struct drm_device *dev, }if (!drm_mode_object_lease_required (objects[o]->type)) { -DRM_DEBUG_KMS ("invalid object for lease\n" ); +drm_dbg_kms (dev,"invalid object for lease\n" ); ret = -EINVAL ; goto out_free_objects; }
drivers/gpu/drm/drm_mipi_dbi.c +4 -3
@@ -265,7 +265,8 @@ static void mipi_dbi_fb_dirty(struct iosys_map *src, struct drm_framebuffer *fb, full = width == fb->width && height == fb->height; -DRM_DEBUG_KMS ("Flushing [FB:%d] " DRM_RECT_FMT "\n" , fb->base.id,DRM_RECT_ARG (rect)); +drm_dbg_kms (fb->dev,"Flushing [FB:%d] " DRM_RECT_FMT "\n" , + fb->base.id,DRM_RECT_ARG (rect));if (!dbi->dc || !full || swap || fb->format->format ==DRM_FORMAT_XRGB8888 ) {
@@ -408,7 +409,7 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe) {struct mipi_dbi_dev *dbidev =drm_to_mipi_dbi_dev (pipe->crtc.dev); -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&dbidev->drm,"\n" );if (dbidev->backlight)backlight_disable (dbidev->backlight);
@@ -627,7 +628,7 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev *dbidev, drm->mode_config.max_height = dbidev->mode.vdisplay; dbidev->rotation = rotation; -DRM_DEBUG_KMS ("rotation = %u\n" , rotation); +drm_dbg_kms (drm,"rotation = %u\n" , rotation);return 0 ; }
drivers/gpu/drm/drm_modes.c +5 -5
@@ -52,11 +52,11 @@* drm_mode_debug_printmodeline - print a mode to dmesg * @mode: mode to print * -* Describe @mode using DRM_DEBUG. +* Describe @mode using drm_dbg_kms(). */ void drm_mode_debug_printmodeline (const struct drm_display_mode *mode) { -DRM_DEBUG_KMS ("Modeline " DRM_MODE_FMT "\n" ,DRM_MODE_ARG (mode)); +drm_dbg_kms (NULL ,"Modeline " DRM_MODE_FMT "\n" ,DRM_MODE_ARG (mode)); }EXPORT_SYMBOL (drm_mode_debug_printmodeline);
@@ -1812,9 +1812,9 @@ void drm_mode_prune_invalid(struct drm_device *dev, }if (verbose) {drm_mode_debug_printmodeline (mode); -DRM_DEBUG_KMS ("Not using %s mode: %s\n" , - mode->name, -drm_get_mode_status_name (mode->status)); +drm_dbg_kms (dev,"Not using %s mode: %s\n" , + mode->name, +drm_get_mode_status_name (mode->status)); }drm_mode_destroy (dev, mode); }
drivers/gpu/drm/drm_plane.c +16 -16
@@ -275,7 +275,7 @@ static int __drm_universal_plane_init(struct drm_device *dev, plane->format_types =kmalloc_array (format_count,sizeof (uint32_t ),GFP_KERNEL );if (!plane->format_types) { -DRM_DEBUG_KMS ("out of memory when allocating plane\n" ); +drm_dbg_kms (dev,"out of memory when allocating plane\n" );drm_mode_object_unregister (dev, &plane->base);return -ENOMEM ; }
@@ -302,7 +302,7 @@ static int __drm_universal_plane_init(struct drm_device *dev, GFP_KERNEL);if (format_modifier_count && !plane->modifiers) { -DRM_DEBUG_KMS ("out of memory when allocating plane\n" ); +drm_dbg_kms (dev,"out of memory when allocating plane\n" );kfree (plane->format_types);drm_mode_object_unregister (dev, &plane->base);return -ENOMEM ;
@@ -786,7 +786,7 @@ static int __setplane_check(struct drm_plane *plane,/* Check whether this plane is usable on this CRTC */ if (!(plane->possible_crtcs &drm_crtc_mask (crtc))) { -DRM_DEBUG_KMS ("Invalid crtc for plane\n" ); +drm_dbg_kms (plane->dev,"Invalid crtc for plane\n" );return -EINVAL ; }
@@ -794,8 +794,9 @@ static int __setplane_check(struct drm_plane *plane, ret =drm_plane_check_pixel_format (plane, fb->format->format, fb->modifier);if (ret) { -DRM_DEBUG_KMS ("Invalid pixel format %p4cc, modifier 0x%llx\n" , - &fb->format->format, fb->modifier); +drm_dbg_kms (fb->dev, +"Invalid pixel format %p4cc, modifier 0x%llx\n" , + &fb->format->format, fb->modifier);return ret; }
@@ -804,8 +805,8 @@ static int __setplane_check(struct drm_plane *plane, crtc_x > INT_MAX - (int32_t) crtc_w || crtc_h > INT_MAX || crtc_y > INT_MAX - (int32_t) crtc_h) { -DRM_DEBUG_KMS ("Invalid CRTC coordinates %ux%u+%d+%d\n" , - crtc_w, crtc_h, crtc_x, crtc_y); +drm_dbg_kms (crtc->dev,"Invalid CRTC coordinates %ux%u+%d+%d\n" , + crtc_w, crtc_h, crtc_x, crtc_y);return -ERANGE ; }
@@ -982,24 +983,23 @@ int drm_mode_setplane(struct drm_device *dev, void *data,*/ plane =drm_plane_find (dev, file_priv, plane_req->plane_id);if (!plane) { -DRM_DEBUG_KMS ("Unknown plane ID %d\n" , - plane_req->plane_id); +drm_dbg_kms (dev,"Unknown plane ID %d\n" , plane_req->plane_id);return -ENOENT ; }if (plane_req->fb_id) { fb =drm_framebuffer_lookup (dev, file_priv, plane_req->fb_id);if (!fb) { -DRM_DEBUG_KMS ("Unknown framebuffer ID %d\n" , - plane_req->fb_id); +drm_dbg_kms (dev,"Unknown framebuffer ID %d\n" , + plane_req->fb_id);return -ENOENT ; } crtc =drm_crtc_find (dev, file_priv, plane_req->crtc_id);if (!crtc) {drm_framebuffer_put (fb); -DRM_DEBUG_KMS ("Unknown crtc ID %d\n" , - plane_req->crtc_id); +drm_dbg_kms (dev,"Unknown crtc ID %d\n" , + plane_req->crtc_id);return -ENOENT ; } }
@@ -1048,7 +1048,7 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc,if (req->handle) { fb =drm_internal_framebuffer_create (dev, &fbreq, file_priv);if (IS_ERR (fb)) { -DRM_DEBUG_KMS ("failed to wrap cursor buffer in drm framebuffer\n" ); +drm_dbg_kms (dev,"failed to wrap cursor buffer in drm framebuffer\n" );return PTR_ERR (fb); }
@@ -1119,7 +1119,7 @@ static int drm_mode_cursor_common(struct drm_device *dev, crtc =drm_crtc_find (dev, file_priv, req->crtc_id);if (!crtc) { -DRM_DEBUG_KMS ("Unknown CRTC ID %d\n" , req->crtc_id); +drm_dbg_kms (dev,"Unknown CRTC ID %d\n" , req->crtc_id);return -ENOENT ; }
@@ -1340,7 +1340,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,* to modifier changes. */ if (old_fb->format->format != fb->format->format) { -DRM_DEBUG_KMS ("Page flip is not allowed to change frame buffer format.\n" ); +drm_dbg_kms (dev,"Page flip is not allowed to change frame buffer format.\n" ); ret = -EINVAL ; goto out; }
drivers/gpu/drm/drm_probe_helper.c +20 -19
@@ -504,8 +504,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,drm_modeset_acquire_init (&ctx,0 ); -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s]\n" , connector->base.id, - connector->name); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s]\n" , connector->base.id, + connector->name); retry: ret =drm_modeset_lock (&dev->mode_config.connection_mutex, &ctx);
@@ -548,11 +548,12 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,* check here, and if anything changed start the hotplug code. */ if (old_status != connector->status) { -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] status updated from %s to %s\n" , - connector->base.id, - connector->name, -drm_get_connector_status_name (old_status), -drm_get_connector_status_name (connector->status)); +drm_dbg_kms (dev, +"[CONNECTOR:%d:%s] status updated from %s to %s\n" , + connector->base.id, + connector->name, +drm_get_connector_status_name (old_status), +drm_get_connector_status_name (connector->status));/* * The hotplug event code might call into the fb
@@ -573,8 +574,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, dev->mode_config.poll_running = drm_kms_helper_poll;if (connector->status == connector_status_disconnected) { -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] disconnected\n" , - connector->base.id, connector->name); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] disconnected\n" , + connector->base.id, connector->name);drm_connector_update_edid_property (connector,NULL );drm_mode_prune_invalid (dev, &connector->modes, false); goto exit;
@@ -632,8 +633,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,drm_mode_sort (&connector->modes); -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] probed modes :\n" , connector->base.id, - connector->name); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] probed modes :\n" , + connector->base.id, connector->name);list_for_each_entry (mode, &connector->modes, head) {drm_mode_set_crtcinfo (mode,CRTC_INTERLACE_HALVE_V );drm_mode_debug_printmodeline (mode);
@@ -764,14 +765,14 @@ static void output_poll_execute(struct work_struct *work) old =drm_get_connector_status_name (old_status); new =drm_get_connector_status_name (connector->status); -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] " -"status updated from %s to %s\n" , - connector->base.id, - connector->name, - old, new); -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n" , - connector->base.id, connector->name, - old_epoch_counter, connector->epoch_counter); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] " +"status updated from %s to %s\n" , + connector->base.id, + connector->name, + old, new); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n" , + connector->base.id, connector->name, + old_epoch_counter, connector->epoch_counter); changed = true; }
drivers/gpu/drm/drm_rect.c +2 -2
@@ -228,9 +228,9 @@ EXPORT_SYMBOL(drm_rect_calc_vscale);void drm_rect_debug_print (const char *prefix,const struct drm_rect *r,bool fixed_point) {if (fixed_point) -DRM_DEBUG_KMS ("%s" DRM_RECT_FP_FMT "\n" , prefix,DRM_RECT_FP_ARG (r)); +drm_dbg_kms (NULL ,"%s" DRM_RECT_FP_FMT "\n" , prefix,DRM_RECT_FP_ARG (r));else -DRM_DEBUG_KMS ("%s" DRM_RECT_FMT "\n" , prefix,DRM_RECT_ARG (r)); +drm_dbg_kms (NULL ,"%s" DRM_RECT_FMT "\n" , prefix,DRM_RECT_ARG (r)); }EXPORT_SYMBOL (drm_rect_debug_print);
drivers/gpu/drm/drm_sysfs.c +4 -4
@@ -178,10 +178,10 @@ static ssize_t status_store(struct device *device, ret = -EINVAL ;if (old_force != connector->force || !connector->force) { -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] force updated from %d to %d or reprobing\n" , - connector->base.id, - connector->name, - old_force, connector->force); +drm_dbg_kms (dev,"[CONNECTOR:%d:%s] force updated from %d to %d or reprobing\n" , + connector->base.id, + connector->name, + old_force, connector->force); connector->funcs->fill_modes(connector, dev->mode_config.max_width,
Signature · 1 line
2.39.0
PATCH v6 8/10 drm: Remove usage of deprecated DRM_DEBUG_PRIME
In reply to Siddh Raman Pantdrm_print.h says DRM_DEBUG_PRIME is deprecated in favor of drm_dbg_prime().
--- drivers/gpu/drm/drm_gem_dma_helper.c | 4 ++-- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_dma_helper.c +2 -2
@@ -477,8 +477,8 @@ drm_gem_dma_prime_import_sg_table(struct drm_device *dev, dma_obj->dma_addr =sg_dma_address (sgt->sgl); dma_obj->sgt = sgt; -DRM_DEBUG_PRIME ("dma_addr = %pad, size = %zu\n" , &dma_obj->dma_addr, - attach->dmabuf->size); +drm_dbg_prime (dev,"dma_addr = %pad, size = %zu\n" , &dma_obj->dma_addr, + attach->dmabuf->size);return &dma_obj->base; }
drivers/gpu/drm/drm_gem_shmem_helper.c +1 -1
@@ -760,7 +760,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev, shmem->sgt = sgt; -DRM_DEBUG_PRIME ("size = %zu\n" , size); +drm_dbg_prime (dev,"size = %zu\n" , size);return &shmem->base; }
Signature · 1 line
2.39.0
PATCH v6 9/10 drm/drm_blend: Remove usage of deprecated DRM_DEBUG_ATOMIC
In reply to Siddh Raman Pantdrm_print.h says DRM_DEBUG_ATOMIC is deprecated in favor of drm_dbg_atomic().
--- drivers/gpu/drm/drm_blend.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_blend.c +6 -7
@@ -450,8 +450,8 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,int i, n =0 ;int ret =0 ; -DRM_DEBUG_ATOMIC ("[CRTC:%d:%s] calculating normalized zpos values\n" , - crtc->base.id, crtc->name); +drm_dbg_atomic (dev,"[CRTC:%d:%s] calculating normalized zpos values\n" , + crtc->base.id, crtc->name); states =kmalloc_array (total_planes,sizeof (*states),GFP_KERNEL );if (!states)
@@ -469,9 +469,8 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc, goto done; } states[n++] = plane_state; -DRM_DEBUG_ATOMIC ("[PLANE:%d:%s] processing zpos value %d\n" , - plane->base.id, plane->name, - plane_state->zpos); +drm_dbg_atomic (dev,"[PLANE:%d:%s] processing zpos value %d\n" , + plane->base.id, plane->name, plane_state->zpos); }sort (states, n,sizeof (*states), drm_atomic_state_zpos_cmp,NULL );
@@ -480,8 +479,8 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc, plane = states[i]->plane; states[i]->normalized_zpos = i; -DRM_DEBUG_ATOMIC ("[PLANE:%d:%s] normalized zpos value %d\n" , - plane->base.id, plane->name, i); +drm_dbg_atomic (dev,"[PLANE:%d:%s] normalized zpos value %d\n" , + plane->base.id, plane->name, i); } crtc_state->zpos_changed = true;
Signature · 1 line
2.39.0
PATCH v6 10/10 drm/drm_lease: Remove usage of deprecated DRM_DEBUG_LEASE
In reply to Siddh Raman Pantdrm_print.h says DRM_DEBUG_LEASE is deprecated in favor of drm_dbg_lease().
--- drivers/gpu/drm/drm_lease.c | 64 ++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 30 deletions(-)
drivers/gpu/drm/drm_lease.c +34 -30
@@ -213,11 +213,11 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idrint id;void *entry; -DRM_DEBUG_LEASE ("lessor %d\n" , lessor->lessee_id); +drm_dbg_lease (dev,"lessor %d\n" , lessor->lessee_id); lessee =drm_master_create (lessor->dev);if (!lessee) { -DRM_DEBUG_LEASE ("drm_master_create failed\n" ); +drm_dbg_lease (dev,"drm_master_create failed\n" );return ERR_PTR (-ENOMEM ); }
@@ -231,7 +231,7 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr error = -EBUSY ;if (error !=0 ) { -DRM_DEBUG_LEASE ("object %d failed %d\n" , object, error); +drm_dbg_lease (dev,"object %d failed %d\n" , object, error); goto out_lessee; } }
@@ -249,7 +249,8 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr/* Move the leases over */ lessee->leases = *leases; -DRM_DEBUG_LEASE ("new lessee %d %p, lessor %d %p\n" , lessee->lessee_id, lessee, lessor->lessee_id, lessor); +drm_dbg_lease (dev,"new lessee %d %p, lessor %d %p\n" , + lessee->lessee_id, lessee, lessor->lessee_id, lessor);mutex_unlock (&dev->mode_config.idr_mutex);return lessee;
@@ -268,7 +269,7 @@ void drm_lease_destroy(struct drm_master *master)mutex_lock (&dev->mode_config.idr_mutex); -DRM_DEBUG_LEASE ("drm_lease_destroy %d\n" , master->lessee_id); +drm_dbg_lease (dev,"drm_lease_destroy %d\n" , master->lessee_id);/* This master is referenced by all lessees, hence it cannot be destroyed * until all of them have been
@@ -277,7 +278,8 @@ void drm_lease_destroy(struct drm_master *master)/* Remove this master from the lessee idr in the owner */ if (master->lessee_id !=0 ) { -DRM_DEBUG_LEASE ("remove master %d from device list of lessees\n" , master->lessee_id); +drm_dbg_lease (dev,"remove master %d from device list of lessees\n" , + master->lessee_id);idr_remove (&(drm_lease_owner (master)->lessee_idr), master->lessee_id); }
@@ -292,7 +294,7 @@ void drm_lease_destroy(struct drm_master *master)drm_master_put (&master->lessor); } -DRM_DEBUG_LEASE ("drm_lease_destroy done %d\n" , master->lessee_id); +drm_dbg_lease (dev,"drm_lease_destroy done %d\n" , master->lessee_id); }static void _drm_lease_revoke (struct drm_master *top)
@@ -308,7 +310,8 @@ static void _drm_lease_revoke(struct drm_master *top)* the tree is fully connected, we can do this without recursing */ for (;;) { -DRM_DEBUG_LEASE ("revoke leases for %p %d\n" , master, master->lessee_id); +drm_dbg_lease (master->dev,"revoke leases for %p %d\n" , + master, master->lessee_id);/* Evacuate the lease */ idr_for_each_entry (&master->leases, entry, object)
@@ -408,7 +411,7 @@ static int fill_object_idr(struct drm_device *dev, ret =validate_lease (dev, object_count, objects, universal_planes);if (ret) { -DRM_DEBUG_LEASE ("lease validation failed\n" ); +drm_dbg_lease (dev,"lease validation failed\n" ); goto out_free_objects; }
@@ -418,7 +421,7 @@ static int fill_object_idr(struct drm_device *dev,struct drm_mode_object *obj = objects[o];u32 object_id = objects[o]->id; -DRM_DEBUG_LEASE ("Adding object %d to lease\n" , object_id); +drm_dbg_lease (dev,"Adding object %d to lease\n" , object_id);/* * We're using an IDR to hold the set of leased
@@ -430,8 +433,8 @@ static int fill_object_idr(struct drm_device *dev,*/ ret =idr_alloc (leases, &drm_lease_idr_object , object_id, object_id +1 ,GFP_KERNEL );if (ret <0 ) { -DRM_DEBUG_LEASE ("Object %d cannot be inserted into leases (%d)\n" , - object_id, ret); +drm_dbg_lease (dev,"Object %d cannot be inserted into leases (%d)\n" , + object_id, ret); goto out_free_objects; }if (obj->type ==DRM_MODE_OBJECT_CRTC && !universal_planes) {
@@ -439,15 +442,15 @@ static int fill_object_idr(struct drm_device *dev, ret =idr_alloc (leases, &drm_lease_idr_object, crtc->primary->base.id, crtc->primary->base.id +1 ,GFP_KERNEL );if (ret <0 ) { -DRM_DEBUG_LEASE ("Object primary plane %d cannot be inserted into leases (%d)\n" , - object_id, ret); +drm_dbg_lease (dev,"Object primary plane %d cannot be inserted into leases (%d)\n" , + object_id, ret); goto out_free_objects; }if (crtc->cursor) { ret =idr_alloc (leases, &drm_lease_idr_object, crtc->cursor->base.id, crtc->cursor->base.id +1 ,GFP_KERNEL );if (ret <0 ) { -DRM_DEBUG_LEASE ("Object cursor plane %d cannot be inserted into leases (%d)\n" , - object_id, ret); +drm_dbg_lease (dev,"Object cursor plane %d cannot be inserted into leases (%d)\n" , + object_id, ret); goto out_free_objects; } }
@@ -490,14 +493,14 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,return -EOPNOTSUPP ;if (cl->flags && (cl->flags & ~(O_CLOEXEC |O_NONBLOCK ))) { -DRM_DEBUG_LEASE ("invalid flags\n" ); +drm_dbg_lease (dev,"invalid flags\n" );return -EINVAL ; } lessor =drm_file_get_master (lessor_priv);/* Do not allow sub-leases */ if (lessor->lessor) { -DRM_DEBUG_LEASE ("recursive leasing not allowed\n" ); +drm_dbg_lease (dev,"recursive leasing not allowed\n" ); ret = -EINVAL ; goto out_lessor; }
@@ -520,7 +523,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, object_count, object_ids);kfree (object_ids);if (ret) { -DRM_DEBUG_LEASE ("lease object lookup failed: %i\n" , ret); +drm_dbg_lease (dev,"lease object lookup failed: %i\n" , ret);idr_destroy (&leases); goto out_lessor; }
@@ -534,7 +537,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, goto out_lessor; } -DRM_DEBUG_LEASE ("Creating lease\n" ); +drm_dbg_lease (dev,"Creating lease\n" );/* lessee will take the ownership of leases */ lessee =drm_lease_create (lessor, &leases);
@@ -545,7 +548,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, }/* Clone the lessor file to create a new file for us */ -DRM_DEBUG_LEASE ("Allocating lease file\n" ); +drm_dbg_lease (dev,"Allocating lease file\n" ); lessee_file =file_clone_open (lessor_file);if (IS_ERR (lessee_file)) { ret =PTR_ERR (lessee_file);
@@ -560,7 +563,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, lessee_priv->authenticated =1 ;/* Pass fd back to userspace */ -DRM_DEBUG_LEASE ("Returning fd %d id %d\n" , fd, lessee->lessee_id); +drm_dbg_lease (dev,"Returning fd %d id %d\n" , fd, lessee->lessee_id); cl->fd = fd; cl->lessee_id = lessee->lessee_id;
@@ -568,7 +571,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,fd_install (fd, lessee_file);drm_master_put (&lessor); -DRM_DEBUG_LEASE ("drm_mode_create_lease_ioctl succeeded\n" ); +drm_dbg_lease (dev,"drm_mode_create_lease_ioctl succeeded\n" );return 0 ; out_lessee:
@@ -579,7 +582,7 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, out_lessor:drm_master_put (&lessor); -DRM_DEBUG_LEASE ("drm_mode_create_lease_ioctl failed: %d\n" , ret); +drm_dbg_lease (dev,"drm_mode_create_lease_ioctl failed: %d\n" , ret);return ret; }
@@ -601,7 +604,7 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev,return -EOPNOTSUPP ; lessor =drm_file_get_master (lessor_priv); -DRM_DEBUG_LEASE ("List lessees for %d\n" , lessor->lessee_id); +drm_dbg_lease (dev,"List lessees for %d\n" , lessor->lessee_id);mutex_lock (&dev->mode_config.idr_mutex);
@@ -610,7 +613,8 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev,/* Only list un-revoked leases */ if (!idr_is_empty (&lessee->leases)) {if (count_lessees > count) { -DRM_DEBUG_LEASE ("Add lessee %d\n" , lessee->lessee_id); +drm_dbg_lease (dev,"Add lessee %d\n" , + lessee->lessee_id); ret =put_user (lessee->lessee_id, lessee_ids + count);if (ret)break ;
@@ -619,7 +623,7 @@ int drm_mode_list_lessees_ioctl(struct drm_device *dev, } } -DRM_DEBUG_LEASE ("Lessor leases to %d\n" , count); +drm_dbg_lease (dev,"Lessor leases to %d\n" , count);if (ret ==0 ) arg->count_lessees = count;
@@ -651,7 +655,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev,return -EOPNOTSUPP ; lessee =drm_file_get_master (lessee_priv); -DRM_DEBUG_LEASE ("get lease for %d\n" , lessee->lessee_id); +drm_dbg_lease (dev,"get lease for %d\n" , lessee->lessee_id);mutex_lock (&dev->mode_config.idr_mutex);
@@ -665,7 +669,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, count =0 ;idr_for_each_entry (object_idr, entry, object) {if (count_objects > count) { -DRM_DEBUG_LEASE ("adding object %d\n" , object); +drm_dbg_lease (dev,"adding object %d\n" , object); ret =put_user (object, object_ids + count);if (ret)break ;
@@ -696,7 +700,7 @@ int drm_mode_revoke_lease_ioctl(struct drm_device *dev,struct drm_master *lessee;int ret =0 ; -DRM_DEBUG_LEASE ("revoke lease for %d\n" , arg->lessee_id); +drm_dbg_lease (dev,"revoke lease for %d\n" , arg->lessee_id);/* Can't lease without MODESET */ if (!drm_core_check_feature (dev,DRIVER_MODESET ))
Signature · 1 line
2.39.0
I pushed the last 3 patches to drm-misc-next.
Quoted 1 line · Simon Ser
I pushed the last 3 patches to drm-misc-next.
Thank you!
Quoted 34 lines · Siddh Raman Pant
This patchset aims to remove usages of deprecated DRM_* macros from the files residing in
drivers/gpu/drmroot.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. Courtesy discussion on v1, I added support for NULL in drm_()* macros too.
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.
---
v5 -> v6:
- Movedrm_deviceto default case in_Genericas it is the default behaviour.
- Fix incorrect constdrm_devicehandling in_Generic.
- Minor positioning / comment changes.[...]
Siddh Raman Pant (10):
drm/print: Fix and add support for NULL as first argument in drm_*
macros
drm: Remove usage of deprecatedDRM_INFO
drm: Remove usage of deprecatedDRM_NOTE
drm: Remove usage of deprecatedDRM_ERROR
drm: Remove usage of deprecatedDRM_DEBUG
drm: Remove usage of deprecatedDRM_DEBUG_DRIVER
drm: Remove usage of deprecatedDRM_DEBUG_KMS
drm: Remove usage of deprecatedDRM_DEBUG_PRIMEdrm/drm_blend: Remove usage of deprecatedDRM_DEBUG_ATOMICdrm/drm_lease: Remove usage of deprecatedDRM_DEBUG_LEASE
Quoted 1 line
[...]
Hello,
Please review these patches, which I sent more than 2 weeks ago. Note that the last three patches have been already merged. Lore link is:
https://lore.kernel.org/dri-devel/[email protected]/
Thanks,
Siddh