30 files changed, 469 insertions, 360 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 5556ce979199..ee95e950a19b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -752,6 +752,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
 
                 if (!adev->pm.fw) {
                         switch (adev->asic_type) {
+                        case CHIP_TOPAZ:
+                                strcpy(fw_name, "amdgpu/topaz_smc.bin");
+                                break;
                         case CHIP_TONGA:
                                 strcpy(fw_name, "amdgpu/tonga_smc.bin");
                                 break;
@@ -800,6 +803,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
 
                 info->version = adev->pm.fw_version;
                 info->image_size = ucode_size;
+                info->ucode_start_address = ucode_start_address;
                 info->kptr = (void *)src;
         }
         return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index d1558768cfb7..0b109aebfec6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -204,16 +204,25 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)
         if (seq != ring->fence_drv.sync_seq)
                 amdgpu_fence_schedule_fallback(ring);
 
-        while (last_seq != seq) {
+        if (unlikely(seq == last_seq))
+                return;
+
+        last_seq &= drv->num_fences_mask;
+        seq &= drv->num_fences_mask;
+
+        do {
                 struct fence *fence, **ptr;
 
-                ptr = &drv->fences[++last_seq & drv->num_fences_mask];
+                ++last_seq;
+                last_seq &= drv->num_fences_mask;
+                ptr = &drv->fences[last_seq];
 
                 /* There is always exactly one thread signaling this fence slot */
                 fence = rcu_dereference_protected(*ptr, 1);
                 RCU_INIT_POINTER(*ptr, NULL);
 
-                BUG_ON(!fence);
+                if (!fence)
+                        continue;
 
                 r = fence_signal(fence);
                 if (!r)
@@ -222,7 +231,7 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)
                         BUG();
 
                 fence_put(fence);
-        }
+        } while (last_seq != seq);
 }
 
 /**
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 46c3097c5224..428ebf3a4387 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -122,7 +122,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         bool skip_preamble, need_ctx_switch;
         unsigned patch_offset = ~0;
         struct amdgpu_vm *vm;
-        struct fence *hwf;
         uint64_t ctx;
 
         unsigned i;
@@ -190,7 +189,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         if (ring->funcs->emit_hdp_invalidate)
                 amdgpu_ring_emit_hdp_invalidate(ring);
 
-        r = amdgpu_fence_emit(ring, &hwf);
+        r = amdgpu_fence_emit(ring, f);
         if (r) {
                 dev_err(adev->dev, "failed to emit fence (%d)\n", r);
                 if (job && job->vm_id)
@@ -205,9 +204,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                                        AMDGPU_FENCE_FLAG_64BIT);
         }
 
-        if (f)
-                *f = fence_get(hwf);
-
         if (patch_offset != ~0 && ring->funcs->patch_cond_exec)
                 amdgpu_ring_patch_cond_exec(ring, patch_offset);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index aaee0c8f6731..6674d40eb3ab 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -172,15 +172,13 @@ static struct fence *amdgpu_job_run(struct amd_sched_job *sched_job)
         trace_amdgpu_sched_run_job(job);
         r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs,
                                job->sync.last_vm_update, job, &fence);
-        if (r) {
+        if (r)
                 DRM_ERROR("Error scheduling IBs (%d)\n", r);
-                goto err;
-        }
 
-err:
         /* if gpu reset, hw fence will be replaced here */
         fence_put(job->fence);
-        job->fence = fence;
+        job->fence = fence_get(fence);
+        amdgpu_job_free_resources(job);
         return fence;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index 499803f3ce3a..0d8d65eb46cd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -149,24 +149,26 @@ TRACE_EVENT(amdgpu_sched_run_job,
 
 
 TRACE_EVENT(amdgpu_vm_grab_id,
-            TP_PROTO(struct amdgpu_vm *vm, int ring, unsigned vmid,
-                     uint64_t pd_addr),
-            TP_ARGS(vm, ring, vmid, pd_addr),
+            TP_PROTO(struct amdgpu_vm *vm, int ring, struct amdgpu_job *job),
+            TP_ARGS(vm, ring, job),
             TP_STRUCT__entry(
                              __field(struct amdgpu_vm *, vm)
                              __field(u32, ring)
                              __field(u32, vmid)
                              __field(u64, pd_addr)