Commit 616bceae authored by Christian König's avatar Christian König Committed by Boris Brezillon
Browse files

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: 09593216 ("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: https://github.com/llvm/llvm-project/commit/20219106060208f0c2f5d096eb3aed7b712f5067


Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Reported-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
CC: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230731123625.3766-1-christian.koenig@amd.com
parent 20404204

include/drm/drm_exec.h

+7 −7
Original line number Diff line number Diff line
@@ -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)
@@ -75,10 +76,9 @@ struct drm_exec { 
 * to make sure that the retry is only used from within the loops body.

 */

#define drm_exec_until_all_locked(exec)					\

__PASTE(__drm_exec_, __LINE__):						\

	for (void *__drm_exec_retry_ptr; ({				\

		__label__ __drm_exec_retry;			\

__drm_exec_retry:						\

		__drm_exec_retry_ptr = &&__drm_exec_retry;	\

		__drm_exec_retry_ptr = &&__PASTE(__drm_exec_, __LINE__);\

		(void)__drm_exec_retry_ptr;				\

		drm_exec_cleanup(exec);					\

	});)