diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2021-11-25 12:47:45 +0000 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2021-11-25 12:52:32 +0000 |
| commit | 16d69a891970a8f97f0aac4e7ed0ccbf167a936b (patch) | |
| tree | 5de14abd2d8b69666d47afbfbe4d415383f784d6 /drivers/gpu/drm/lima/lima_sched.c | |
| parent | 5652df829b3c2cee92bd0903a0e70455868fa1a5 (diff) | |
| parent | c18c8891111bb5e014e144716044991112f16833 (diff) | |
| download | linux-16d69a891970a8f97f0aac4e7ed0ccbf167a936b.tar.gz linux-16d69a891970a8f97f0aac4e7ed0ccbf167a936b.tar.bz2 linux-16d69a891970a8f97f0aac4e7ed0ccbf167a936b.zip | |
Merge drm/drm-next into drm-intel-gt-next
Maarten requested a backmerge due his work depending on subtle semantic
changes introduced by:
7e2e69ed4678 ("drm/i915: Fix i915_request fence wait semantics")
2cbb8d4d6770 ("drm/i915: use new iterator in i915_gem_object_wait_reservation")
Both should probably have been merged to drm-intel-gt-next anyway.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/lima/lima_sched.c')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c index 99d5f6f1a882..5612d73f238f 100644 --- a/drivers/gpu/drm/lima/lima_sched.c +++ b/drivers/gpu/drm/lima/lima_sched.c @@ -371,7 +371,7 @@ static void lima_sched_build_error_task_list(struct lima_sched_task *task) } else { buffer_chunk->size = lima_bo_size(bo); - ret = drm_gem_shmem_vmap(&bo->base.base, &map); + ret = drm_gem_shmem_vmap(&bo->base, &map); if (ret) { kvfree(et); goto out; @@ -379,7 +379,7 @@ static void lima_sched_build_error_task_list(struct lima_sched_task *task) memcpy(buffer_chunk + 1, map.vaddr, buffer_chunk->size); - drm_gem_shmem_vunmap(&bo->base.base, &map); + drm_gem_shmem_vunmap(&bo->base, &map); } buffer_chunk = (void *)(buffer_chunk + 1) + buffer_chunk->size; |