[PATCH] drm/panic: Add missing static inline to drm_panic_is_enabled()

Jocelyn Falempe jfalempe at redhat.com
Fri Jul 19 12:17:12 UTC 2024



On 19/07/2024 14:01, Imre Deak wrote:
> On Fri, Jul 19, 2024 at 02:43:27PM +0300, Imre Deak wrote:
>> On Fri, Jul 19, 2024 at 02:39:11PM +0300, Imre Deak wrote:
>>> On Fri, Jul 19, 2024 at 12:36:08PM +0200, Jocelyn Falempe wrote:
>>>> This breaks build if DRM_PANIC is not enabled.
>>>>
>>>> Fixes: de338c754d40 ("drm/panic: Add missing static inline to drm_panic_is_enabled()")
>>
>> The fix is actually for 9f774c42a908 ("drm/panic: Add drm_panic_is_enabled()")

Yes, picked up the wrong sha1.
> 
> A related issue, DRM_CONFIG_PANIC=y is also borked for me:
> 
>    CC [M]  drivers/gpu/drm/drm_panic.o
> drivers/gpu/drm/drm_panic.c:712:6: error: no previous prototype for ‘drm_panic_is_enabled’ [-Werror=missing-prototypes]
>    712 | bool drm_panic_is_enabled(struct drm_device *dev)
>        |      ^~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
ok it's missing the #include "drm_crtc_internal.h" in drm_panic.c.
how did I missed that :(
let me send a v2.

-- 

Jocelyn

>>>> Signed-off-by: Jocelyn Falempe <jfalempe at redhat.com>
>>>
>>> Thanks for the quick fix:
>>> Reviewed-by: Imre Deak <imre.deak at intel.com>
>>>
>>>> ---
>>>>   drivers/gpu/drm/drm_crtc_internal.h | 2 +-
>>>>   1 file changed, 1 insertion(+), 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
>>>>   
>>>>   #endif /* __DRM_CRTC_INTERNAL_H__ */
>>>> -- 
>>>> 2.45.2
>>>>
> 



More information about the dri-devel mailing list