[PATCH] drm/xe: Fix compilation without CONFIG_KUNIT

Michal Wajdeczko michal.wajdeczko at intel.com
Tue Jan 9 15:10:34 UTC 2024



On 05.01.2024 18:19, Michal Wajdeczko wrote:
> It looks that declaration of kunit_get_current_test() was
> available in xe_guc_relay.c only with CONFIG_KUNIT enabled.
> If CONFIG_KUNIT is disabled we fail with:
> 
> In file included from ../include/linux/build_bug.h:5,
>                  from ../include/linux/bitfield.h:10,
>                  from ../drivers/gpu/drm/xe/xe_guc_relay.c:6:
> ../drivers/gpu/drm/xe/xe_guc_relay.c: In function ‘xe_guc_relay_process_guc2vf’:
> ../drivers/gpu/drm/xe/xe_guc_relay.c:863:52: error: implicit declaration of function ‘kunit_get_current_test’ [-Werror=implicit-function-declaration]
>   863 |  if (unlikely(!IS_SRIOV_VF(relay_to_xe(relay)) && !kunit_get_current_test()))
>       |                                                    ^~~~~~~~~~~~~~~~~~~~~~
> ../include/linux/compiler.h:77:42: note: in definition of macro ‘unlikely’
>    77 | # define unlikely(x) __builtin_expect(!!(x), 0)
>       |                                          ^
> 
> Reported-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> Fixes: 9a2c2ecb1b77 ("drm/xe/guc: Introduce Relay Communication for SR-IOV")

kernel test robot says problem was introduces by other patch, so it
should rather be:

Fixes: 27b717bac93f ("drm/xe/kunit: Add GuC Relay kunit test")

and since it's already merged, also for the record:

Closes:
https://lore.kernel.org/oe-kbuild-all/202401070036.60pNn4uZ-lkp@intel.com/

> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_guc_relay.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_relay.c b/drivers/gpu/drm/xe/xe_guc_relay.c
> index b772088979bd..c0a2d8d5d3b3 100644
> --- a/drivers/gpu/drm/xe/xe_guc_relay.c
> +++ b/drivers/gpu/drm/xe/xe_guc_relay.c
> @@ -9,6 +9,7 @@
>  #include <drm/drm_managed.h>
>  
>  #include <kunit/static_stub.h>
> +#include <kunit/test-bug.h>
>  
>  #include "abi/guc_actions_sriov_abi.h"
>  #include "abi/guc_relay_actions_abi.h"


More information about the Intel-xe mailing list