From patchwork Fri Dec 20 17:09:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3390161 Return-Path: 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C63AE9F314 for ; Fri, 20 Dec 2013 17:09:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7469D20604 for ; Fri, 20 Dec 2013 17:09:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5B3B5204D3 for ; Fri, 20 Dec 2013 17:09:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E0B31FA540; Fri, 20 Dec 2013 09:09:53 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qe0-f41.google.com (mail-qe0-f41.google.com [209.85.128.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B2CDFA540 for ; Fri, 20 Dec 2013 09:09:52 -0800 (PST) Received: by mail-qe0-f41.google.com with SMTP id gh4so2662943qeb.0 for ; Fri, 20 Dec 2013 09:09:52 -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; bh=efIo1z0t1lzG+qq40a0NW6HWGrQyPIci+nJFf+0BKx0=; b=A6It7RWEmZgSxjiv+O+m7+fnta2ujRct3xaSgK73TDv6qkXqLT8m573eGVzRK4qmAE 6rSR2VMlvob8kG+JvLXzqNkTXXdDAJY+vbE/DMFWO5jZnEHTD2gF5T7YSx//Il7e6yzX RWPtcFwSlx2JCkDOrQWXC2UXjfxCUxZmxYQ9uh+2WcY4fJWYHFYQEXDSxiXK8cMH+WBW cDRPTzCXsvCGVKLHfNFJRjCBDw8ZC/fEKVCEZUcdcIp+MsaLbC9aUddfQUyOuF8IQDAP KHLX1p9e2Ui3eOlXOvxLDAKLIFUnnJs136EtvLQvI6FmsEIcI+J6iyhYn5Xmok2IwsKY A15A== X-Received: by 10.224.41.82 with SMTP id n18mr15749690qae.91.1387559391978; Fri, 20 Dec 2013 09:09:51 -0800 (PST) Received: from localhost.localdomain ([177.40.53.102]) by mx.google.com with ESMTPSA id nz10sm7234908qeb.10.2013.12.20.09.09.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Dec 2013 09:09:51 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 20 Dec 2013 15:09:41 -0200 Message-Id: <1387559381-1515-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.3.1 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: avoid unclaimed registers when capturing the error state X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Paulo Zanoni We're iterating over the CPU transcoders, so check for the correct power domain. This fixes many "unclaimed register" error messages. This can be reproduced by the IGT test mentioned below, but we still get a FAIL when we run it. Testcase: igt/kms_lip/flip-vs-panning-vs-hang Signed-off-by: Paulo Zanoni Reviewed-by: Imre Deak --- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) I didn't bisect to check, but it really really looks like a regression from "drm/i915: add intel_display_power_enabled_sw() for use in atomic ctx". diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4d1357a..4d4b4bc 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11459,7 +11459,8 @@ intel_display_capture_error_state(struct drm_device *dev) enum transcoder cpu_transcoder = transcoders[i]; error->transcoder[i].power_domain_on = - intel_display_power_enabled_sw(dev, POWER_DOMAIN_PIPE(i)); + intel_display_power_enabled_sw(dev, + POWER_DOMAIN_TRANSCODER(cpu_transcoder)); if (!error->transcoder[i].power_domain_on) continue;