Skip to content

Commit

Permalink
drm/xe: Fix kunit integration due to missing prototypes
Browse files Browse the repository at this point in the history
In order to avoid  -Werror=missing-prototypes, add the prototypes
in a separate tests/<test-name>_test.h file that is included by both
the implementation (tests/xe_<testname>.c, injected in xe.ko) and the
kunit module (tests/xe_<testname>_test.c -> xe-<testname>-test.ko).

v2: Add header and don't add ifdef to files that are already not built
when not using kunit (Matt Auld)

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
  • Loading branch information
Lucas De Marchi authored and Rodrigo Vivi committed Dec 19, 2023
1 parent 5b7e50e commit 353dfaa
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 7 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/xe/tests/xe_bo.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include <kunit/test.h>

#include "tests/xe_bo_test.h"

#include "xe_bo_evict.h"
#include "xe_pci.h"

Expand Down
5 changes: 2 additions & 3 deletions drivers/gpu/drm/xe/tests/xe_bo_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
* Copyright © 2022 Intel Corporation
*/

#include <kunit/test.h>
#include "xe_bo_test.h"

void xe_ccs_migrate_kunit(struct kunit *test);
void xe_bo_evict_kunit(struct kunit *test);
#include <kunit/test.h>

static struct kunit_case xe_bo_tests[] = {
KUNIT_CASE(xe_ccs_migrate_kunit),
Expand Down
14 changes: 14 additions & 0 deletions drivers/gpu/drm/xe/tests/xe_bo_test.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0 AND MIT */
/*
* Copyright © 2023 Intel Corporation
*/

#ifndef __XE_BO_TEST_H__
#define __XE_BO_TEST_H__

struct kunit;

void xe_ccs_migrate_kunit(struct kunit *test);
void xe_bo_evict_kunit(struct kunit *test);

#endif
2 changes: 2 additions & 0 deletions drivers/gpu/drm/xe/tests/xe_dma_buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include <kunit/test.h>

#include "tests/xe_dma_buf_test.h"

#include "xe_pci.h"

static bool p2p_enabled(struct dma_buf_test_params *params)
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/xe/tests/xe_dma_buf_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Copyright © 2022 Intel Corporation
*/

#include <kunit/test.h>
#include "xe_dma_buf_test.h"

void xe_dma_buf_kunit(struct kunit *test);
#include <kunit/test.h>

static struct kunit_case xe_dma_buf_tests[] = {
KUNIT_CASE(xe_dma_buf_kunit),
Expand Down
13 changes: 13 additions & 0 deletions drivers/gpu/drm/xe/tests/xe_dma_buf_test.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0 AND MIT */
/*
* Copyright © 2023 Intel Corporation
*/

#ifndef __XE_DMA_BUF_TEST_H__
#define __XE_DMA_BUF_TEST_H__

struct kunit;

void xe_dma_buf_kunit(struct kunit *test);

#endif
2 changes: 2 additions & 0 deletions drivers/gpu/drm/xe/tests/xe_migrate.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include <kunit/test.h>

#include "tests/xe_migrate_test.h"

#include "xe_pci.h"

static bool sanity_fence_failed(struct xe_device *xe, struct dma_fence *fence,
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/xe/tests/xe_migrate_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Copyright © 2022 Intel Corporation
*/

#include <kunit/test.h>
#include "xe_migrate_test.h"

void xe_migrate_sanity_kunit(struct kunit *test);
#include <kunit/test.h>

static struct kunit_case xe_migrate_tests[] = {
KUNIT_CASE(xe_migrate_sanity_kunit),
Expand Down
13 changes: 13 additions & 0 deletions drivers/gpu/drm/xe/tests/xe_migrate_test.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0 AND MIT */
/*
* Copyright © 2023 Intel Corporation
*/

#ifndef __XE_MIGRATE_TEST_H__
#define __XE_MIGRATE_TEST_H__

struct kunit;

void xe_migrate_sanity_kunit(struct kunit *test);

#endif

0 comments on commit 353dfaa

Please sign in to comment.