From patchwork Thu Sep 10 15:34:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 7154841 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 542FDBEEC1 for ; Thu, 10 Sep 2015 15:34:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 508B12080A for ; Thu, 10 Sep 2015 15:34:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6E4B420805 for ; Thu, 10 Sep 2015 15:34:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02E4F6E53B; Thu, 10 Sep 2015 08:34:38 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from gproxy10-pub.mail.unifiedlayer.com (gproxy10-pub.mail.unifiedlayer.com [69.89.20.226]) by gabe.freedesktop.org (Postfix) with SMTP id 659ED6E53B for ; Thu, 10 Sep 2015 08:34:36 -0700 (PDT) Received: (qmail 6296 invoked by uid 0); 10 Sep 2015 15:34:34 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy10.mail.unifiedlayer.com with SMTP; 10 Sep 2015 15:34:34 -0000 Received: from box514.bluehost.com ([74.220.219.114]) by cmgw3 with id FZaU1r0022UhLwi01ZaXWu; Thu, 10 Sep 2015 15:34:33 -0600 X-Authority-Analysis: v=2.1 cv=GpXRpCFC c=1 sm=1 tr=0 a=9W6Fsu4pMcyimqnCr1W0/w==:117 a=9W6Fsu4pMcyimqnCr1W0/w==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=TBVoxVdAAAAA:8 a=GhZ5P8ky69gA:10 a=noBwr2J6l1kA:10 a=ff-B7xzCdYMA:10 a=e5mUnYsNAAAA:8 a=_bAzBEmNXglpa3wg6y0A:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=tKsQzOLlgMdTcJib1yWVH3R2jd+WVNg2bVWsVU/NuWY=; b=a/Zhc/V8rU9v5n4bozGYeCmhqBeJKjRJporfRNyMGbc/k/D8TIM1EBk6b6J3yUTMa8i2RNp687s708NECbPlJVSk9U9+0412wU7GWvyvM0SzaTPwwG98dZy5wbLkiRzh; Received: from [67.161.37.189] (port=40588 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.84) (envelope-from ) id 1Za3ro-0002Uk-V2 for intel-gfx@lists.freedesktop.org; Thu, 10 Sep 2015 09:34:29 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 10 Sep 2015 08:34:23 -0700 Message-Id: <1441899263-12986-2-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441899263-12986-1-git-send-email-jbarnes@virtuousgeek.org> References: <1441899263-12986-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 2/2] drm/i915: add more debug info for when atomic updates fail 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 I used these additional fields to track down the issue I saw on HSW. References: https://bugs.freedesktop.org/show_bug.cgi?id=91579 Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_sprite.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 46484e4..90cad50 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -565,6 +565,8 @@ struct intel_crtc { unsigned start_vbl_count; ktime_t start_vbl_time; + int min_vbl, max_vbl; + int scanline_start; struct intel_crtc_atomic_commit atomic; diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 0c2c62f..ff8c9d5 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -94,6 +94,9 @@ void intel_pipe_update_start(struct intel_crtc *crtc) min = vblank_start - usecs_to_scanlines(mode, 100); max = vblank_start - 1; + crtc->min_vbl = min; + crtc->max_vbl = max; + local_irq_disable(); crtc->start_vbl_count = 0; @@ -122,8 +125,10 @@ void intel_pipe_update_start(struct intel_crtc *crtc) * scanline_offset used to correct the DSL readout.) */ scanline = intel_get_crtc_scanline(crtc); - if (scanline > 2 && (scanline < min || scanline > max)) + if (scanline > 2 && (scanline < min || scanline > max)) { + crtc->scanline_start = scanline; break; + } if (timeout <= 0) { DRM_ERROR("Potential atomic update failure on pipe %c\n", @@ -169,10 +174,13 @@ void intel_pipe_update_end(struct intel_crtc *crtc) local_irq_enable(); - if (crtc->start_vbl_count && crtc->start_vbl_count != end_vbl_count) - DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u) time %lld us\n", + if (crtc->start_vbl_count && crtc->start_vbl_count != end_vbl_count) { + DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u) time %lld us, min %d, max %d, scanline start %d, end %d\n", pipe_name(pipe), crtc->start_vbl_count, end_vbl_count, - ktime_us_delta(end_vbl_time, crtc->start_vbl_time)); + ktime_us_delta(end_vbl_time, crtc->start_vbl_time), + crtc->min_vbl, crtc->max_vbl, crtc->scanline_start, + intel_get_crtc_scanline(crtc)); + } } static void