raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

drm/vc4: tests: Fix up vc4_test_lbm_size

Browse Source 
Following the example of [1], move the state allocation out of the init
function to make it thread safe.

[1] commit 7e0351ae91 ("drm/vc4: tests: Stop allocating the state in
test init")

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
This commit is contained in:
Phil Elwell
2025-04-28 17:17:33 +01:00
committed by Dom Cobley
parent a10daa88e6
commit 74fca5f515
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c
View File

@@ -23,7 +23,6 @@ struct vc4_lbm_size_priv {
struct vc4_dev *vc4;
struct drm_file *file;
struct drm_modeset_acquire_ctx ctx;
struct drm_atomic_state *state;
};
struct vc4_lbm_size_param {
@@ -181,16 +180,25 @@ static void drm_vc4_test_vc4_lbm_size(struct kunit *test)
const struct vc4_lbm_size_priv *priv = test->priv;
const struct drm_format_info *info;
struct drm_mode_fb_cmd2 fb_req = { };
struct drm_atomic_state *state = priv->state;
struct vc4_plane_state *vc4_plane_state;
struct drm_plane_state *plane_state;
struct drm_modeset_acquire_ctx ctx;
struct vc4_dummy_output *output;
struct drm_atomic_state *state;
struct drm_framebuffer *fb;
struct drm_plane *plane;
struct drm_device *drm;
struct drm_crtc *crtc;
unsigned int i;
int ret;
drm_modeset_acquire_init(&ctx, 0);
vc4 = priv->vc4;
drm = &vc4->base;
state = drm_kunit_helper_atomic_state_alloc(test, drm, &ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
info = drm_format_info(params->fourcc);
KUNIT_ASSERT_NOT_NULL(test, info);
@@ -263,6 +271,9 @@ static void drm_vc4_test_vc4_lbm_size(struct kunit *test)
for (i = 0; i < info->num_planes; i++)
drm_mode_destroy_dumb(state->dev, fb_req.handles[i], priv->file);
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
}
static struct kunit_case vc4_lbm_size_tests[] = {
@@ -273,9 +284,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;
struct vc4_lbm_size_priv *priv;
struct drm_device *drm;
struct vc4_dev *vc4;
priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
@@ -289,13 +298,6 @@ 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 = &vc4->base;
priv->state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->state);
return 0;
}