From patchwork Wed Nov 19 17:38:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5339921 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7139CC11AC for ; Wed, 19 Nov 2014 17:38:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 964FE201EF for ; Wed, 19 Nov 2014 17:38:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A9C512017E for ; Wed, 19 Nov 2014 17:38:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEBDE6EB14; Wed, 19 Nov 2014 09:38:04 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 87BE46EB85 for ; Wed, 19 Nov 2014 09:38:02 -0800 (PST) Received: by mail-wi0-f182.google.com with SMTP id h11so2724196wiw.9 for ; Wed, 19 Nov 2014 09:38:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jtc+H993TDQfqc5Lc6qCCPr+i4O2n4orXZ6Phqdh9no=; b=IIRj0ee2kVXeBchCWAge4om7pqOmGrZIkms2leJCeVMOb30KCiDQnLdxP5mxJD3hcP GRMEaeBY3bII3xEMJuUgdklKEaMorN2b4i2xMQZ+3ySi3dfg2b9Andgmi85PJWCYAoTG 0qQPnj80z9N9WfZYJ0bMK2x/epssZ5lxGHww8= 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:in-reply-to :references; bh=jtc+H993TDQfqc5Lc6qCCPr+i4O2n4orXZ6Phqdh9no=; b=lTFkNTnRZo1rONNLgFoDVI8vBNwbm8FE08ch1iQeS+88Zsolnh7Y4YfQ+s6py5VIBh crzrsK7uFMr+owstPLSMkUem8+QiD0DaBxa2XNL0BWUo2iG0SGnTiLzIC10paiZMCp0e OmQRd8O0yuKW6mSiXQN70baiExVKhCgSJ+XX+5RhGXZnOb4/67tc78XzM4rRzWKdf8dT Qbhw9AQUat12bc4womvWQXHT9Zx9/p51q7PjYrK9obI75FU/B8ZV4Mqw29KaAqrd1/4e PskbbitqscZt/BZjdRsSWCaiW+Wv81a7Z4SJ/VJdByQUQ3/6XSMY6jgmQ2jNRqsGVpIU qnhg== X-Gm-Message-State: ALoCoQlgIArA91p1t8Sa/wTxCENspMPiIMBuvFWj2fL4HEmM3mylHdWyZQfnjTqHZ31xtNWkVemJ X-Received: by 10.195.12.45 with SMTP id en13mr59230764wjd.8.1416418681837; Wed, 19 Nov 2014 09:38:01 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id h2sm567617wix.5.2014.11.19.09.38.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Nov 2014 09:38:01 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 6/6] drm/atomic_helper: Make it clear that commit_planes gets the old state Date: Wed, 19 Nov 2014 18:38:11 +0100 Message-Id: <1416418691-24747-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1416418691-24747-1-git-send-email-daniel.vetter@ffwll.ch> References: <1416418691-24747-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Oversight from my kerneldoc cleanup when doing the original atomic helper series - I've only applied this clarification to the modeset related helpers, and not the plane update code. Remedy this asap. Signed-off-by: Daniel Vetter Reviewed-by: Rob Clark --- drivers/gpu/drm/drm_atomic_helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 99095ef147ef..690360038dc1 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -976,18 +976,18 @@ EXPORT_SYMBOL(drm_atomic_helper_prepare_planes); /** * drm_atomic_helper_commit_planes - commit plane state * @dev: DRM device - * @state: atomic state + * @old_state: atomic state object with old state structures * * This function commits the new plane state using the plane and atomic helper * functions for planes and crtcs. It assumes that the atomic state has already * been pushed into the relevant object state pointers, since this step can no * longer fail. * - * It still requires the global state object @state to know which planes and + * It still requires the global state object @old_state to know which planes and * crtcs need to be updated though. */ void drm_atomic_helper_commit_planes(struct drm_device *dev, - struct drm_atomic_state *state) + struct drm_atomic_state *old_state) { int nplanes = dev->mode_config.num_total_plane; int ncrtcs = dev->mode_config.num_crtc; @@ -995,7 +995,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, for (i = 0; i < ncrtcs; i++) { struct drm_crtc_helper_funcs *funcs; - struct drm_crtc *crtc = state->crtcs[i]; + struct drm_crtc *crtc = old_state->crtcs[i]; if (!crtc) continue; @@ -1010,7 +1010,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, for (i = 0; i < nplanes; i++) { struct drm_plane_helper_funcs *funcs; - struct drm_plane *plane = state->planes[i]; + struct drm_plane *plane = old_state->planes[i]; if (!plane) continue; @@ -1025,7 +1025,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, for (i = 0; i < ncrtcs; i++) { struct drm_crtc_helper_funcs *funcs; - struct drm_crtc *crtc = state->crtcs[i]; + struct drm_crtc *crtc = old_state->crtcs[i]; if (!crtc) continue;