diff options
| author | Rob Herring <[email protected]> | 2020-06-12 09:57:00 -0600 |
|---|---|---|
| committer | Rob Herring <[email protected]> | 2020-06-12 09:57:00 -0600 |
| commit | 8440d4a75d90556cfb8fb3e244443f67381aafd6 (patch) | |
| tree | 2e1c986942c3beb6257121e52449f827a8ce4eaf /drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | |
| parent | f8d8b46cd20e3a262c17ba1061640d9c190ad769 (diff) | |
| parent | 447615701525c910a386a491a6780dec4971f797 (diff) | |
Merge branch 'dt/schema-cleanups' into dt/linus
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index b86392253696..b87ca171986a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c @@ -249,6 +249,11 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync, owner != AMDGPU_FENCE_OWNER_UNDEFINED) continue; + /* Never sync to VM updates either. */ + if (fence_owner == AMDGPU_FENCE_OWNER_VM && + owner != AMDGPU_FENCE_OWNER_UNDEFINED) + continue; + /* Ignore fences depending on the sync mode */ switch (mode) { case AMDGPU_SYNC_ALWAYS: |