From patchwork Thu Jan 14 16:32:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 8033991 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EF3BF9F6FA for ; Thu, 14 Jan 2016 16:30:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E587E2049C for ; Thu, 14 Jan 2016 16:30:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 06BF920499 for ; Thu, 14 Jan 2016 16:30:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B0776EA12; Thu, 14 Jan 2016 08:30:50 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 29FD46EA12 for ; Thu, 14 Jan 2016 08:30:49 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 14 Jan 2016 08:30:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,295,1449561600"; d="scan'208";a="881382453" Received: from rosetta.fi.intel.com (HELO rosetta) ([10.237.72.66]) by fmsmga001.fm.intel.com with ESMTP; 14 Jan 2016 08:30:47 -0800 Received: by rosetta (Postfix, from userid 1000) id F033881941; Thu, 14 Jan 2016 18:32:13 +0200 (EET) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Thu, 14 Jan 2016 18:32:10 +0200 Message-Id: <1452789130-20878-1-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Don't do pre plane update on disabled crtcs 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.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 CI/Bat got following (shortened) trace on byt and also on bsw: ------------[ cut here ]----------- Unclaimed register detected before reading register 0x186500 Call Trace: __unclaimed_reg_debug+0x68/0x80 [i915] vlv_read32+0x2de/0x370 [i915] intel_set_memory_cxsr+0x87/0x1a0 [i915] intel_pre_plane_update+0xb3/0xf0 [i915] intel_atomic_commit+0x3b5/0x17c0 [i915] ... ---[ end trace 6387a0ad001bb39f ]--- Fix this by limiting pre plane update only to active crtcs. References: https://bugs.freedesktop.org/show_bug.cgi?id=93698 Cc: Ville Syrjälä Cc: Maarten Lankhorst Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index aa24f79d85bf..a134a698d97d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13580,9 +13580,8 @@ static int intel_atomic_commit(struct drm_device *dev, if (!needs_modeset(crtc->state)) continue; - intel_pre_plane_update(intel_crtc); - if (crtc_state->active) { + intel_pre_plane_update(intel_crtc); intel_crtc_disable_planes(crtc, crtc_state->plane_mask); dev_priv->display.crtc_disable(crtc); intel_crtc->active = false;