mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 11:51:27 +00:00
829e8def7b
We need the rename of reservation_object to dma_resv.
The solution on this merge came from linux-next:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Aug 2019 12:48:39 +1000
Subject: [PATCH] drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/gt/intel_engine_pool.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pool.c b/drivers/gpu/drm/i915/gt/intel_engine_pool.c
index 03d90b49584a..4cd54c569911 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_pool.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pool.c
@@ -43,12 +43,12 @@ static int pool_active(struct i915_active *ref)
{
struct intel_engine_pool_node *node =
container_of(ref, typeof(*node), active);
- struct reservation_object *resv = node->obj->base.resv;
+ struct dma_resv *resv = node->obj->base.resv;
int err;
- if (reservation_object_trylock(resv)) {
- reservation_object_add_excl_fence(resv, NULL);
- reservation_object_unlock(resv);
+ if (dma_resv_trylock(resv)) {
+ dma_resv_add_excl_fence(resv, NULL);
+ dma_resv_unlock(resv);
}
err = i915_gem_object_pin_pages(node->obj);
which is a simplified version from a previous one which had:
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
|
||
|---|---|---|
| .. | ||
| bridge | ||
| dp-mst | ||
| afbc.rst | ||
| amdgpu-dc.rst | ||
| amdgpu.rst | ||
| drivers.rst | ||
| drm-client.rst | ||
| drm-internals.rst | ||
| drm-kms-helpers.rst | ||
| drm-kms.rst | ||
| drm-mm.rst | ||
| drm-uapi.rst | ||
| i915.rst | ||
| index.rst | ||
| introduction.rst | ||
| kms-properties.csv | ||
| komeda-kms.rst | ||
| mcde.rst | ||
| meson.rst | ||
| msm-crash-dump.rst | ||
| pl111.rst | ||
| tegra.rst | ||
| todo.rst | ||
| tve200.rst | ||
| v3d.rst | ||
| vc4.rst | ||
| vga-switcheroo.rst | ||
| vgaarbiter.rst | ||
| vkms.rst | ||
| xen-front.rst | ||