From patchwork Mon May 4 13:42:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6326851 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 85D2B9F374 for ; Mon, 4 May 2015 13:40:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C178E20320 for ; Mon, 4 May 2015 13:40:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9D449202EC for ; Mon, 4 May 2015 13:40:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 559286E3BA; Mon, 4 May 2015 06:40:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 020426E3BA for ; Mon, 4 May 2015 06:40:34 -0700 (PDT) Received: by widdi4 with SMTP id di4so121916908wid.0 for ; Mon, 04 May 2015 06:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=6IEykJsgwtbvC9I45iUPWnFXVOkBTEnIVUJIi5j/gQo=; b=BD8ExC8/g9ekFMkUWFUOXLj+3mmpZgSuA996KSt+5JU0ka3QxlYs8To+23CHst5o0f t7E0MIgK8JjzOkwMyaK3LIT0SpKFIOpSZgedJSn0SSW1KGHXnxUInscuS9wUUI4z8OUA FJFXJdyWibTRpIjOjrSnbQ8Hljfee6U8joevI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6IEykJsgwtbvC9I45iUPWnFXVOkBTEnIVUJIi5j/gQo=; b=RrkPKHhZcdy2XJU9JHXdrcD8pFU/BHm5MzCuJ9qR3hE1UjfmFK5vhNqiqZ1rtMoX2v gVECC3MX0h0wtDgeQdBBLl2dLvhU8jpfgiHvt7daLXSScsdOge6f7TnWAeHESqg2SDtX l/HVERVsPIrZnZ+q+qHH6BY+37CfTBxqS043wswSiKMYktvHQ0gW+2a1JTkdMywrSRnl FNzZADvPxodX4OZkRk1k42Y5aqLNxUB8HBd3mXHdmn3+0zG8SyFAmYMURQtzk8xsGhsr r2h+X+bwsRv/jh6/OjQzFgaJVZ475L4oyDuHDv+olKXr7dAfh4tAHo5BADmOJEsTU1M/ Fh1Q== X-Gm-Message-State: ALoCoQmgfoIorhFdFa7+VmVroC3mHlVTv4ap7zhZjyJVa8WrH8Nfx2x+Rb2XnmQdAX47Xmh0DCNU X-Received: by 10.194.93.195 with SMTP id cw3mr3023030wjb.150.1430746832885; Mon, 04 May 2015 06:40:32 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id z13sm20675172wjr.44.2015.05.04.06.40.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 May 2015 06:40:32 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Mon, 4 May 2015 15:42:48 +0200 Message-Id: <1430746968-28097-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/atomic-helper: Really recover pre-atomic plane/cursor behavior 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=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 I've fumbled this in commit f02ad907cd9e7fe3a6405d2d005840912f1ed258 Author: Daniel Vetter Date: Thu Jan 22 16:36:23 2015 +0100 drm/atomic-helpers: Recover full cursor plane behaviour and accidentally put the assignment for legacy_cursor_upate after the atomic commit, where it is pretty useless. Reported-by: Maarten Lankhorst Cc: Maarten Lankhorst Signed-off-by: Daniel Vetter Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/drm_atomic_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index d536817699c1..9f216ff61af3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1310,13 +1310,13 @@ retry: plane_state->src_h = src_h; plane_state->src_w = src_w; + if (plane == crtc->cursor) + state->legacy_cursor_update = true; + ret = drm_atomic_commit(state); if (ret != 0) goto fail; - if (plane == crtc->cursor) - state->legacy_cursor_update = true; - /* Driver takes ownership of state on successful commit. */ return 0; fail: