From: Jocelyn Falempe Date: Fri, 19 Jul 2024 12:20:40 +0000 (+0200) Subject: drm/panic: Add missing static inline to drm_panic_is_enabled() X-Git-Tag: v6.12-rc1~126^2~24^2~78 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e33fc2ff6754b5ff39b11297f713cd0841d9962;p=thirdparty%2Fkernel%2Flinux.git drm/panic: Add missing static inline to drm_panic_is_enabled() This breaks build if DRM_PANIC is not enabled. Also add the missing include drm_crtc_internal.h in drm_panic.c Fixes: 9f774c42a908 ("drm/panic: Add drm_panic_is_enabled()") Signed-off-by: Jocelyn Falempe Reviewed-by: Michal Wajdeczko Link: https://patchwork.freedesktop.org/patch/msgid/20240719122051.1507927-1-jfalempe@redhat.com --- diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index c10de39cbe831..4314274c5e406 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -321,7 +321,7 @@ drm_edid_load_firmware(struct drm_connector *connector) #ifdef CONFIG_DRM_PANIC bool drm_panic_is_enabled(struct drm_device *dev); #else -bool drm_panic_is_enabled(struct drm_device *dev) {return false; } +static inline bool drm_panic_is_enabled(struct drm_device *dev) { return false; } #endif #endif /* __DRM_CRTC_INTERNAL_H__ */ diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 9f1a3568e62de..072752b658f0d 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -27,6 +27,8 @@ #include #include +#include "drm_crtc_internal.h" + MODULE_AUTHOR("Jocelyn Falempe"); MODULE_DESCRIPTION("DRM panic handler"); MODULE_LICENSE("GPL");