From patchwork Tue Apr  5 11:00:44 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
X-Patchwork-Id: 8749521
Return-Path: <intel-gfx-bounces@lists.freedesktop.org>
X-Original-To: patchwork-intel-gfx@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.29.136])
	by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B1129F3D1
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Tue,  5 Apr 2016 11:00:55 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
	by mail.kernel.org (Postfix) with ESMTP id BB80720351
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Tue,  5 Apr 2016 11:00:54 +0000 (UTC)
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by mail.kernel.org (Postfix) with ESMTP id 393FC2034C
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Tue,  5 Apr 2016 11:00:49 +0000 (UTC)
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id B96086E741;
	Tue,  5 Apr 2016 11:00:48 +0000 (UTC)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
	by gabe.freedesktop.org (Postfix) with ESMTP id 4CF236E740
	for <intel-gfx@lists.freedesktop.org>;
	Tue,  5 Apr 2016 11:00:47 +0000 (UTC)
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
	by fmsmga101.fm.intel.com with ESMTP; 05 Apr 2016 04:00:47 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.24,443,1455004800"; d="scan'208";a="681062482"
Received: from rgroves-mobl5.ger.corp.intel.com (HELO patser.lan)
	([10.252.4.126])
	by FMSMGA003.fm.intel.com with ESMTP; 05 Apr 2016 04:00:46 -0700
To: intel-gfx@lists.freedesktop.org
References: 
 <1459853797-30180-1-git-send-email-maarten.lankhorst@linux.intel.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Message-ID: <57039ADC.4010601@linux.intel.com>
Date: Tue, 5 Apr 2016 13:00:44 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
	Thunderbird/38.1.0
MIME-Version: 1.0
In-Reply-To: 
 <1459853797-30180-1-git-send-email-maarten.lankhorst@linux.intel.com>
Subject: [Intel-gfx] [PATCH i-g-t] drv_hangman: Add test for modeset during
	gpu reset.
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED,
	RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

This adds a test that forces a modeset during gpu reset, which has broken
a few times in the past during the atomic rework.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com

diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c
index f4cdadb80e02..8a17d7acff1b 100644
--- a/tests/drv_hangman.c
+++ b/tests/drv_hangman.c
@@ -324,6 +324,22 @@ static void hangcheck_unterminated(void)
 	close(fd);
 }
 
+static void reset_with_forced_modeset(void)
+{
+	igt_hang_ring_t hang;
+	int fd = drm_open_driver(DRIVER_INTEL);
+
+	igt_require_hang_ring(fd, I915_EXEC_DEFAULT);
+
+	igt_set_module_param_int("force_reset_modeset_test", 1);
+
+	hang = igt_hang_ring(fd, I915_EXEC_DEFAULT);
+	igt_post_hang_ring(fd, hang);
+
+	igt_set_module_param_int("force_reset_modeset_test", 0);
+	close(fd);
+}
+
 igt_main
 {
 	const struct intel_execution_engine *e;
@@ -353,4 +369,7 @@ igt_main
 
 	igt_subtest("hangcheck-unterminated")
 		hangcheck_unterminated();
+
+	igt_subtest("reset-with-forced-modeset")
+		reset_with_forced_modeset();
 }