Re: [PATCH] drm/print: Handle NULL drm device in __drm_printk()

[Jani Nikula]

On Thu, 16 Nov 2023, Luben Tuikov  wrote:
> drm_{err,warn,...}() use __drm_printk() which takes a drm device pointer and
> uses the embedded device pointer to print the device. This facility handles
> NULL device pointer, but not NULL drm device pointer. This patch makes
> __drm_printk() also handle a NULL drm device pointer. The printed output is
> identical to if drm->dev had been NULL.
>
> Signed-off-by: Luben Tuikov 

Reviewed-by: Jani Nikula 

> ---
>  include/drm/drm_print.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index a93a387f8a1a15..dd4883df876a6d 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -453,7 +453,7 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct 
> device *dev,
>  
>  /* Helper for struct drm_device based logging. */
>  #define __drm_printk(drm, level, type, fmt, ...) \
> - dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
> + dev_##level##type((drm) ? (drm)->dev : NULL, "[drm] " fmt, 
> ##__VA_ARGS__)
>  
>  
>  #define drm_info(drm, fmt, ...)  \
>
> base-commit: 3b434a3445fff3149128db0169da864d67057325

-- 
Jani Nikula, Intel

[PATCH] drm/print: Handle NULL drm device in __drm_printk()

[Luben Tuikov]

drm_{err,warn,...}() use __drm_printk() which takes a drm device pointer and
uses the embedded device pointer to print the device. This facility handles
NULL device pointer, but not NULL drm device pointer. This patch makes
__drm_printk() also handle a NULL drm device pointer. The printed output is
identical to if drm->dev had been NULL.

Signed-off-by: Luben Tuikov 
---
 include/drm/drm_print.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index a93a387f8a1a15..dd4883df876a6d 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -453,7 +453,7 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct 
device *dev,
 
 /* Helper for struct drm_device based logging. */
 #define __drm_printk(drm, level, type, fmt, ...)   \
-   dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
+   dev_##level##type((drm) ? (drm)->dev : NULL, "[drm] " fmt, 
##__VA_ARGS__)
 
 
 #define drm_info(drm, fmt, ...)\

base-commit: 3b434a3445fff3149128db0169da864d67057325
-- 
2.42.1