Skip to content

drm/vc4: tests: Patch up the vc4 kunit tests #6789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 1 commit into from
Apr 15, 2025
Merged

drm/vc4: tests: Patch up the vc4 kunit tests #6789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ static struct kunit_case vc4_lbm_size_tests[] = {

static int vc4_lbm_size_test_init(struct kunit *test)
{
struct drm_modeset_acquire_ctx *ctx;
static struct drm_modeset_acquire_ctx ctx;
struct vc4_lbm_size_priv *priv;
struct drm_device *drm;
struct vc4_dev *vc4;
Expand All @@ -295,13 +295,15 @@ static int vc4_lbm_size_test_init(struct kunit *test)
priv->file = drm_file_alloc(priv->vc4->base.primary);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->file);

ctx = drm_kunit_helper_acquire_ctx_alloc(test);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
drm_modeset_acquire_init(&ctx, 0);

drm = &vc4->base;
priv->state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);
priv->state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->state);

drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);

return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ static void drm_vc4_test_pv_muxing_invalid(struct kunit *test)
static int vc4_pv_muxing_test_init(struct kunit *test)
{
const struct pv_muxing_param *params = test->param_value;
struct drm_modeset_acquire_ctx ctx;
static struct drm_modeset_acquire_ctx ctx;
struct pv_muxing_priv *priv;
struct drm_device *drm;
struct vc4_dev *vc4;
Expand Down
Loading