From patchwork Thu Oct 30 18:02:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 5199441 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 A366A9F30B for ; Thu, 30 Oct 2014 18:02:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6A51201FE for ; Thu, 30 Oct 2014 18:02:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E6408201C7 for ; Thu, 30 Oct 2014 18:02:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02ADA890BF; Thu, 30 Oct 2014 11:02:24 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qc0-f170.google.com (mail-qc0-f170.google.com [209.85.216.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 9EB616E0C2 for ; Thu, 30 Oct 2014 11:02:22 -0700 (PDT) Received: by mail-qc0-f170.google.com with SMTP id l6so4702366qcy.29 for ; Thu, 30 Oct 2014 11:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=dmVENV1sFNFKiYheyY+r0eg7d7xP/3qcwq24WL2RyK0=; b=MdUYJKA7ZpxK1GVEN/nwEHidMF9s+C2NUNwIcOQl6wS70epA7Jbv1vVmgqyehx0Bnh /lOCwHK5AjYn2voX7gU4HYrlLCWW7q0lGjSgdSs4FvC8p/TsJHv3yx7IsGabSjwj+XnA epvUIJRf1Ph9esORH52vwNlRVIJoYxW16fIIbv6kjI/kno4FWHb+MKXsGNiiQ7CY4guv TV5JbGRlw38JHGKrigOcX8QNgXMXfaMSy9CBt8+QCqzpryExlQbPYwVwSSFCciyu3ifQ 3iiJmYM65iK95+TAER60HMYryR9FQI2YW5/xMRdn3HF2R9IJ4sim6kKDRiLAucOZq1FB H4Bg== X-Received: by 10.140.31.9 with SMTP id e9mr27362499qge.4.1414692141904; Thu, 30 Oct 2014 11:02:21 -0700 (PDT) Received: from localhost.localdomain (179.187.193.49.dynamic.adsl.gvt.net.br. [179.187.193.49]) by mx.google.com with ESMTPSA id f73sm7318166qge.1.2014.10.30.11.02.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Oct 2014 11:02:21 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 30 Oct 2014 16:02:01 -0200 Message-Id: <1414692121-13150-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20141030143438.GT10649@intel.com> References: <20141030143438.GT10649@intel.com> MIME-Version: 1.0 Cc: Gustavo Padovan , Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: use the correct obj when preparing the sprite plane 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.7 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 Commit "drm/i915: create a prepare phase for sprite plane updates" changed the old_obj pointer we use when committing sprite planes, which caused a WARN() and a BUG() to be triggered. This patch should revert the code back to the previous behavior, fixing the regression. Regression introduced by: commit ec82cb793c9224e0692eed904f43490cf70e8258 Author: Gustavo Padovan Date: Fri Oct 24 14:51:32 2014 +0100 drm/i915: create a prepare phase for sprite plane updates Credits to Imre Deak for pointing out the exact lines that were wrong. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85634 Testcase: igt/pm_rpm/legacy-planes Testcase: igt/pm_rpm/legacy-planes-dpms Testcase: igt/pm_rpm/universal-planes Testcase: igt/pm_rpm/universal-planes-dpms Credits-to: Imre Deak Cc: Gustavo Padovan Cc: Ville Syrjälä Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 8b80d68..1c874309 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1197,10 +1197,11 @@ intel_prepare_sprite_plane(struct drm_plane *plane, struct drm_device *dev = plane->dev; struct drm_crtc *crtc = state->crtc; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + struct intel_plane *intel_plane = to_intel_plane(plane); enum pipe pipe = intel_crtc->pipe; struct drm_framebuffer *fb = state->fb; struct drm_i915_gem_object *obj = intel_fb_obj(fb); - struct drm_i915_gem_object *old_obj = intel_fb_obj(plane->fb); + struct drm_i915_gem_object *old_obj = intel_plane->obj; int ret; if (old_obj != obj) {