From patchwork Fri Dec 14 21:20:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 1880441 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3C2F83FC64 for ; Fri, 14 Dec 2012 21:24:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BDE8E6A3B for ; Fri, 14 Dec 2012 13:24:12 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 15B7BE5CB4 for ; Fri, 14 Dec 2012 13:23:59 -0800 (PST) Received: by mail-vc0-f177.google.com with SMTP id m8so4858036vcd.36 for ; Fri, 14 Dec 2012 13:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=o7qUin1kvI1cSVPhYh452h4AWHl98aBfOwKkYK678Lo=; b=boyi6hUDdfs3+SuLDAn9goxoV8Q8vMTHAsFcdpYar80n049b7rsqF0cMMmUq3dEkEY /3WJRZsg7W5OCjRv29bfx1Bvh70jKIih4KKqT2S87jPop2UiO3V+9FxXF+YyFKndaTyM 0oeO7u55r365aK5pvIQHWn6IS9w1pch8dWNmWm8d8XGirTl+NT+6RyA0ZB2cD7CqYq6P KnHPJ0B+KWc8kDycHAlb00LeziTZ1xjEA3Ep93wdTfo8OJEwi9SgVI0AJrIqKP2MhPOc dRZOqyXNShAObFXSEMej1/Fu2nJC0yPAANPvk+x1zp6lk0I3aJDz8HZaNx+PVGGl//zx A70A== Received: by 10.52.68.175 with SMTP id x15mr9706755vdt.107.1355520239335; Fri, 14 Dec 2012 13:23:59 -0800 (PST) Received: from localhost.boston.devel.redhat.com (ip-86-181-132-209.redhat.com. [209.132.181.86]) by mx.google.com with ESMTPS id ko19sm4136104veb.1.2012.12.14.13.23.57 (version=SSLv3 cipher=OTHER); Fri, 14 Dec 2012 13:23:58 -0800 (PST) From: j.glisse@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: restore modeset late in GPU reset path Date: Fri, 14 Dec 2012 16:20:46 -0500 Message-Id: <1355520046-4248-1-git-send-email-j.glisse@gmail.com> X-Mailer: git-send-email 1.7.11.7 Cc: Jerome Glisse X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org From: Jerome Glisse Modeset path seems to conflict sometimes with the memory management leading to kernel deadlock. This move modesetting reset after GPU acceleration reset. Signed-off-by: Jerome Glisse --- drivers/gpu/drm/radeon/radeon_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index e2f5f88..ffd5534 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1337,7 +1337,6 @@ retry: } radeon_restore_bios_scratch_regs(rdev); - drm_helper_resume_force_mode(rdev->ddev); if (!r) { for (i = 0; i < RADEON_NUM_RINGS; ++i) { @@ -1362,6 +1361,8 @@ retry: } } + drm_helper_resume_force_mode(rdev->ddev); + ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched); if (r) { /* bad news, how to tell it to userspace ? */