drm/connector: Allow max possible encoders to attach to a connector

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_sync.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index 9828f3c7c655f582c18b14600a1948e8ad84dbbc..95e5e93edd18c27ca00ae3bc82c531a87afb1741 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -190,10 +190,10 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync,
  */
 int amdgpu_sync_resv(struct amdgpu_device *adev,
                     struct amdgpu_sync *sync,
-                    struct reservation_object *resv,
+                    struct dma_resv *resv,
                     void *owner, bool explicit_sync)
 {
-       struct reservation_object_list *flist;
+       struct dma_resv_list *flist;
        struct dma_fence *f;
        void *fence_owner;
        unsigned i;
@@ -203,16 +203,16 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
                return -EINVAL;
 
        /* always sync to the exclusive fence */
-       f = reservation_object_get_excl(resv);
+       f = dma_resv_get_excl(resv);
        r = amdgpu_sync_fence(adev, sync, f, false);
 
-       flist = reservation_object_get_list(resv);
+       flist = dma_resv_get_list(resv);
        if (!flist || r)
                return r;
 
        for (i = 0; i < flist->shared_count; ++i) {
                f = rcu_dereference_protected(flist->shared[i],
-                                             reservation_object_held(resv));
+                                             dma_resv_held(resv));
                /* We only want to trigger KFD eviction fences on
                 * evict or move jobs. Skip KFD fences otherwise.
                 */