diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2024-01-15 08:38:05 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2024-01-15 08:38:05 +0100 |
| commit | 0ea5c948cb64bab5bc7a5516774eb8536f05aa0d (patch) | |
| tree | 8437ec451643a0fa3e7e8f3cab5c851dcb5a9c4b /include/drm/drm_print.h | |
| parent | drm/i915/psr: CAN_PSR and CAN_PANEL_REPLAY can be now local defines (diff) | |
| parent | nouveau/gsp: handle engines in runl without nonstall interrupts. (diff) | |
| download | linux-0ea5c948cb64bab5bc7a5516774eb8536f05aa0d.tar.xz linux-0ea5c948cb64bab5bc7a5516774eb8536f05aa0d.zip | |
Merge drm/drm-next into drm-intel-next
Backmerge to bring Xe driver to drm-intel-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/drm/drm_print.h')
| -rw-r--r-- | include/drm/drm_print.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index ad77ac4b6808..5ed26a702e3e 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, ...) \ |