From patchwork Fri Jan 24 21:39:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 11351087 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE5C76C1 for ; Fri, 24 Jan 2020 21:39:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C70812071E for ; Fri, 24 Jan 2020 21:39:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C70812071E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 669B86E34D; Fri, 24 Jan 2020 21:39:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id D46466E34D for ; Fri, 24 Jan 2020 21:39:10 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 20001264-1500050 for multiple; Fri, 24 Jan 2020 21:39:04 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 24 Jan 2020 21:39:03 +0000 Message-Id: <20200124213903.611152-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] i915_pm_rps: Be wary if RP0 == RPn X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lsts.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" If the HW min/max frequencies are the same, there is not much range to deal with and a couple of our invalid tests become confused as they are actually no-ops. Error reporting in i915_pm_rps is rudimentary and we deserve better. Closes: https://gitlab.freedesktop.org/drm/intel/issues/1008 Signed-off-by: Chris Wilson --- tests/i915/i915_pm_rps.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/i915/i915_pm_rps.c b/tests/i915/i915_pm_rps.c index b65eefb03..56c745a5b 100644 --- a/tests/i915/i915_pm_rps.c +++ b/tests/i915/i915_pm_rps.c @@ -397,9 +397,11 @@ static void min_max_config(void (*check)(void), bool load_gpu) writeval_inval(sysfs_files[MIN].filp, origfreqs[RP0] + 1000); check(); - igt_debug("\nDecrease max to RPn (invalid)...\n"); - writeval_inval(sysfs_files[MAX].filp, origfreqs[RPn]); - check(); + if (origfreqs[RPn] < origfreqs[RP0]) { + igt_debug("\nDecrease max to RPn (invalid)...\n"); + writeval_inval(sysfs_files[MAX].filp, origfreqs[RPn]); + check(); + } igt_debug("\nDecrease min to midpoint...\n"); writeval(sysfs_files[MIN].filp, fmid); @@ -429,9 +431,11 @@ static void min_max_config(void (*check)(void), bool load_gpu) writeval_inval(sysfs_files[MAX].filp, 0); check(); - igt_debug("\nIncrease min to RP0 (invalid)...\n"); - writeval_inval(sysfs_files[MIN].filp, origfreqs[RP0]); - check(); + if (origfreqs[RP0] > origfreqs[RP0]) { + igt_debug("\nIncrease min to RP0 (invalid)...\n"); + writeval_inval(sysfs_files[MIN].filp, origfreqs[RP0]); + check(); + } igt_debug("\nIncrease max to midpoint...\n"); writeval(sysfs_files[MAX].filp, fmid);