diff options
| author | Ingo Molnar <[email protected]> | 2016-11-13 08:16:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-11-13 08:16:40 +0100 |
| commit | 74239ac259519a98f4c32439326afe7e7eb64459 (patch) | |
| tree | a3e9a1ae0dc6634e7aa669c8881e425634094257 /drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | |
| parent | a75dcb5848359f488c32c0aef8711d9bd37a77b8 (diff) | |
| parent | 86e4ee760ef2f7571e233a3abf065ffd0bb4089d (diff) | |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index e203e5561107..a5e2fcbef0f0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -43,6 +43,9 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, struct amdgpu_ctx *ctx) ctx->rings[i].sequence = 1; ctx->rings[i].fences = &ctx->fences[amdgpu_sched_jobs * i]; } + + ctx->reset_counter = atomic_read(&adev->gpu_reset_counter); + /* create context entity for each ring */ for (i = 0; i < adev->num_rings; i++) { struct amdgpu_ring *ring = adev->rings[i]; |