[PATCH v2] drm/panic: Add missing static inline to drm_panic_is_enabled()
Jocelyn Falempe
jfalempe at redhat.com
Fri Jul 19 15:37:56 UTC 2024
On 19/07/2024 17:28, Michal Wajdeczko wrote:
>
>
> On 19.07.2024 14:20, Jocelyn Falempe wrote:
>> 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 <jfalempe at redhat.com>
>> ---
>> drivers/gpu/drm/drm_crtc_internal.h | 2 +-
>> drivers/gpu/drm/drm_panic.c | 2 ++
>> 2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
>> index c10de39cbe83..bbac5350774e 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
>
> shouldn't this whole chunk be part of <drm/drm_panic.h> ?
> other exported drm_panic functions have forward declarations there
>
drm/drm_panic.h is for GPU drivers implementing drm_panic.
And they don't need this function.
This function is only for drm internal (it's called from drm_fb_helper.c).
Sima suggested this change in my previous series:
https://lists.freedesktop.org/archives/dri-devel/2024-July/462375.html
I will move drm_panic_[un]register() prototypes there for the same
reason in follow-up patch.
--
Jocelyn
>>
>> #endif /* __DRM_CRTC_INTERNAL_H__ */
>> diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
>> index 9f1a3568e62d..072752b658f0 100644
>> --- a/drivers/gpu/drm/drm_panic.c
>> +++ b/drivers/gpu/drm/drm_panic.c
>> @@ -27,6 +27,8 @@
>> #include <drm/drm_plane.h>
>> #include <drm/drm_print.h>
>>
>> +#include "drm_crtc_internal.h"
>
> then you will not need this include here
>
>> +
>> MODULE_AUTHOR("Jocelyn Falempe");
>> MODULE_DESCRIPTION("DRM panic handler");
>> MODULE_LICENSE("GPL");
>
More information about the dri-devel
mailing list