mirror of
https://github.com/torvalds/linux.git
synced 2026-04-19 07:13:56 -04:00
Merge drm/drm-next into drm-misc-next
Backmerging to get v6.15-rc1 into drm-misc-next. Also fixes a build issue when enabling CONFIG_DRM_SCHED_KUNIT_TEST. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
This commit is contained in:
@@ -125,8 +125,8 @@ drm_mock_sched_job_new(struct kunit *test,
|
||||
init_completion(&job->done);
|
||||
spin_lock_init(&job->lock);
|
||||
INIT_LIST_HEAD(&job->link);
|
||||
hrtimer_init(&job->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
|
||||
job->timer.function = drm_mock_sched_job_signal_timer;
|
||||
hrtimer_setup(&job->timer, drm_mock_sched_job_signal_timer,
|
||||
CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
|
||||
|
||||
return job;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user