diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-09-15 04:07:05 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-09-15 05:13:01 +0300 |
| commit | c3c9acb8b2466ddf7f00fc11e2efb736b5252172 (patch) | |
| tree | 2b4fd80f964f1a8eadfc4bec11512d4a8c78b2c2 /include | |
| parent | c6fbd2b0ca9a752ac797649f0f70e13207bd7f87 (diff) | |
| parent | 139a27854bf5ce93ff9805f9f7683b88c13074dc (diff) | |
| download | linux-c3c9acb8b2466ddf7f00fc11e2efb736b5252172.tar.xz | |
Merge tag 'drm-misc-fixes-2023-09-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Short summary of fixes pull:
* radeon: Uninterruptible fence waiting
* tests: Fix use-after-free bug
* vkms: Revert hrtimer fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230914122649.GA28252@linux-uq9g
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_kunit_helpers.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helpers.h index 514c8a7a32f0..ba483c87f0e7 100644 --- a/include/drm/drm_kunit_helpers.h +++ b/include/drm/drm_kunit_helpers.h @@ -3,6 +3,8 @@ #ifndef DRM_KUNIT_HELPERS_H_ #define DRM_KUNIT_HELPERS_H_ +#include <linux/device.h> + #include <kunit/test.h> struct drm_device; @@ -51,7 +53,7 @@ __drm_kunit_helper_alloc_drm_device(struct kunit *test, { struct drm_driver *driver; - driver = kunit_kzalloc(test, sizeof(*driver), GFP_KERNEL); + driver = devm_kzalloc(dev, sizeof(*driver), GFP_KERNEL); KUNIT_ASSERT_NOT_NULL(test, driver); driver->driver_features = features; |