drm/exec: use unique instead of local label
GCC forbids to jump to labels in loop conditions and a new clang check stumbled over this. So instead using a local label inside the loop condition use an unique label outside of it. Fixes:09593216bf
("drm: execution context for GEM buffers v7") Link: https://gcc.gnu.org/onlinedocs/gcc/Statement-Exprs.html Link: https://github.com/ClangBuiltLinux/linux/issues/1890 Link:2021910606
Reported-by: Nathan Chancellor <nathan@kernel.org> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> CC: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Christian König <christian.koenig@amd.com> Tested-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230731123625.3766-1-christian.koenig@amd.com
This commit is contained in:
Родитель
204042049a
Коммит
616bceae25
|
@ -3,6 +3,7 @@
|
|||
#ifndef __DRM_EXEC_H__
|
||||
#define __DRM_EXEC_H__
|
||||
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/ww_mutex.h>
|
||||
|
||||
#define DRM_EXEC_INTERRUPTIBLE_WAIT BIT(0)
|
||||
|
@ -74,13 +75,12 @@ struct drm_exec {
|
|||
* Since labels can't be defined local to the loops body we use a jump pointer
|
||||
* to make sure that the retry is only used from within the loops body.
|
||||
*/
|
||||
#define drm_exec_until_all_locked(exec) \
|
||||
for (void *__drm_exec_retry_ptr; ({ \
|
||||
__label__ __drm_exec_retry; \
|
||||
__drm_exec_retry: \
|
||||
__drm_exec_retry_ptr = &&__drm_exec_retry; \
|
||||
(void)__drm_exec_retry_ptr; \
|
||||
drm_exec_cleanup(exec); \
|
||||
#define drm_exec_until_all_locked(exec) \
|
||||
__PASTE(__drm_exec_, __LINE__): \
|
||||
for (void *__drm_exec_retry_ptr; ({ \
|
||||
__drm_exec_retry_ptr = &&__PASTE(__drm_exec_, __LINE__);\
|
||||
(void)__drm_exec_retry_ptr; \
|
||||
drm_exec_cleanup(exec); \
|
||||
});)
|
||||
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче