mirror of
https://github.com/torvalds/linux.git
synced 2026-04-25 01:52:32 -04:00
Merge drm/drm-next into drm-xe-next
Backmerging drm-next in order to get up-to-date and in particular
to access commit 9ca5facd04.
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
This commit is contained in:
@@ -115,21 +115,21 @@ static void test_copy(struct xe_migrate *m, struct xe_bo *bo,
|
||||
region |
|
||||
XE_BO_FLAG_NEEDS_CPU_ACCESS);
|
||||
if (IS_ERR(remote)) {
|
||||
KUNIT_FAIL(test, "Failed to allocate remote bo for %s: %li\n",
|
||||
str, PTR_ERR(remote));
|
||||
KUNIT_FAIL(test, "Failed to allocate remote bo for %s: %pe\n",
|
||||
str, remote);
|
||||
return;
|
||||
}
|
||||
|
||||
err = xe_bo_validate(remote, NULL, false);
|
||||
if (err) {
|
||||
KUNIT_FAIL(test, "Failed to validate system bo for %s: %li\n",
|
||||
KUNIT_FAIL(test, "Failed to validate system bo for %s: %i\n",
|
||||
str, err);
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
err = xe_bo_vmap(remote);
|
||||
if (err) {
|
||||
KUNIT_FAIL(test, "Failed to vmap system bo for %s: %li\n",
|
||||
KUNIT_FAIL(test, "Failed to vmap system bo for %s: %i\n",
|
||||
str, err);
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user