Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
From:   Andrey Grodzovsky <andrey.grodzovsky@amd.com>
To:     <linux-kernel@vger.kernel.org>, <amd-gfx@lists.freedesktop.org>
CC:     <Alexander.Deucher@amd.com>, <Christian.Koenig@amd.com>,
        <David.Panariti@amd.com>, <oleg@redhat.com>,
        <akpm@linux-foundation.org>, <ebiederm@xmission.com>,
        Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Subject: [PATCH 3/3] drm/amdgpu: Switch to interrupted wait to recover from ring hang.
Date:   Tue, 24 Apr 2018 11:30:36 -0400
Message-ID: <1524583836-12130-4-git-send-email-andrey.grodzovsky@amd.com>
In-Reply-To: <1524583836-12130-1-git-send-email-andrey.grodzovsky@amd.com>
References: <1524583836-12130-1-git-send-email-andrey.grodzovsky@amd.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2018 15:32:35.1382
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 22f329bb-8cd7-4b60-aedd-08d5a9f89aa3
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXCHOV01.amd.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0332
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If the ring is hanging for some reason allow to recover the waiting
by sending fatal signal.

Originally-by: David Panariti <David.Panariti@amd.com>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index eb80edf..37a36af 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -421,10 +421,16 @@ int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx, unsigned ring_id)
 
 	if (other) {
 		signed long r;
-		r = dma_fence_wait_timeout(other, false, MAX_SCHEDULE_TIMEOUT);
-		if (r < 0) {
-			DRM_ERROR("Error (%ld) waiting for fence!\n", r);
-			return r;
+
+		while (true) {
+			if ((r = dma_fence_wait_timeout(other, true,
+					MAX_SCHEDULE_TIMEOUT)) >= 0)
+				return 0;
+
+			if (fatal_signal_pending(current)) {
+				DRM_ERROR("Error (%ld) waiting for fence!\n", r);
+				return r;
+			}
 		}
 	}
 
-- 
2.7.4