From patchwork Fri Apr 15 09:19:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 8846591 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 223A8C0553 for ; Fri, 15 Apr 2016 09:19:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50FE320373 for ; Fri, 15 Apr 2016 09:19:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6A980202DD for ; Fri, 15 Apr 2016 09:19:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0AE16E089; Fri, 15 Apr 2016 09:19:36 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id CDF876E089 for ; Fri, 15 Apr 2016 09:19:35 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 15 Apr 2016 02:19:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,486,1455004800"; d="scan'208";a="933025317" Received: from tursulin-linux.isw.intel.com ([10.102.226.196]) by orsmga001.jf.intel.com with ESMTP; 15 Apr 2016 02:19:34 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 15 Apr 2016 10:19:32 +0100 Message-Id: <1460711972-22621-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 1.9.1 Subject: [Intel-gfx] [PATCH i-g-t] igt/drv_module_reload_basic: Do not require snd-hda-intel X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 From: Tvrtko Ursulin Recent refactoring has made absence of snd-hda-intel a test failure do the respective modprobe being at the end of a reload function now. Only fail in this case if module was previously unloaded. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson --- tests/drv_module_reload_basic | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/drv_module_reload_basic b/tests/drv_module_reload_basic index fc508d7204b2..3bba796f0306 100755 --- a/tests/drv_module_reload_basic +++ b/tests/drv_module_reload_basic @@ -11,6 +11,8 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" # no other drm service should be running, so we can just unbind function reload() { + local snd_hda_intel_unloaded + echo Reloading i915.ko with $* # we must kick away fbcon (but only fbcon) @@ -23,7 +25,8 @@ function reload() { # The sound driver uses our power well pkill alsactl - rmmod snd_hda_intel &> /dev/null + snd_hda_intel_unloaded=0 + rmmod snd_hda_intel &> /dev/null && snd_hda_intel_unloaded=1 #ignore errors in ips - gen5 only rmmod intel_ips &> /dev/null @@ -47,7 +50,7 @@ function reload() { echo 1 > /sys/class/vtconsole/vtcon1/bind fi - modprobe snd_hda_intel + modprobe -q snd_hda_intel || return $snd_hda_intel_unloaded } function finish_load() {