From patchwork Wed Jun 1 22:06:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9148441 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 93646600BC for ; Wed, 1 Jun 2016 22:07:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85F69265F9 for ; Wed, 1 Jun 2016 22:07:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AD0527151; Wed, 1 Jun 2016 22:07:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A899265F9 for ; Wed, 1 Jun 2016 22:07:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C98856EA7B; Wed, 1 Jun 2016 22:07:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6FC26EA7D for ; Wed, 1 Jun 2016 22:07:17 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id e3so10580498wme.2 for ; Wed, 01 Jun 2016 15:07:17 -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:in-reply-to:references; bh=/kKH+YNXFsIkBK2wj+LGmD0RUQYsDXAGkVcE/Gnt2do=; b=kE6HWZ6zOZf8Dor4AcZ1LRo9Sfz2zD/qL/i6eme7KaL262eAOeSMSeIQIxYTTqaVgw 1n5rxHSvLOR9ekFOSg7kZIdC3H4UyWbt/nVOh/v862hHlgIPAhKvYT5d20z04H/ycqmU Wv9HKRLrJpA8mF3qM/w6m9/+Kd4Dli88VwlQ4= 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=/kKH+YNXFsIkBK2wj+LGmD0RUQYsDXAGkVcE/Gnt2do=; b=IeAYlZ42jPcF/9Nb2HIHd093m++Y/JdUJDfKMjQAK0GHdp5+aWIhQqGK5hqLnRwEwt Fbnvygsyv/bQ2gbNaDp6DiLcinf6e7mD24lc9ipyAU/C1VKavYxkQ2NKj6lpnm5T1bWf Cb7Vi1DRGUMMpAEpxJwzkaBlAdP2V6xy9WvBytAQnXXr76zglG8iMp5OgWu3xGwX1kSX IMWnoK5TLPKmWgKFzlE2ljb5lUyi+/HAyZX88E6eYk6e86SgKcASeVwJo6hTCtbIeQqn HPRvFYBgFicZEpyD9yM7M3lTaLW57tTzgN0xYXzQASdl1KTWzzoUcCJWMTERFhJ9U+sP oRPg== X-Gm-Message-State: ALyK8tJNImnz3g3xZBonIB9W2yVLy3eqR67thkqS3DvVlMdJlx+veQKpBfV3O93FcG9uLg== X-Received: by 10.28.178.70 with SMTP id b67mr5594882wmf.13.1464818835673; Wed, 01 Jun 2016 15:07:15 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id lf7sm1571508wjb.23.2016.06.01.15.07.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 15:07:14 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/38] drm/omap: Use for_each_plane_in_state Date: Thu, 2 Jun 2016 00:06:29 +0200 Message-Id: <1464818821-5736-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> References: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Tomi Valkeinen , Laurent Pinchart , 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-Virus-Scanned: ClamAV using ClamSMTP We want to hide drm_atomic_stat internals a bit better. Cc: Laurent Pinchart Cc: Tomi Valkeinen Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst Acked-by: Laurent Pinchart --- drivers/gpu/drm/omapdrm/omap_drv.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index d86f5479345b..4798ba43ff5b 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -142,8 +142,9 @@ static int omap_atomic_commit(struct drm_device *dev, { struct omap_drm_private *priv = dev->dev_private; struct omap_atomic_state_commit *commit; - unsigned int i; - int ret; + struct drm_crtc *crtc; + struct drm_crtc_state *crtc_state; + int i, ret; ret = drm_atomic_helper_prepare_planes(dev, state); if (ret) @@ -163,10 +164,8 @@ static int omap_atomic_commit(struct drm_device *dev, /* Wait until all affected CRTCs have completed previous commits and * mark them as pending. */ - for (i = 0; i < dev->mode_config.num_crtc; ++i) { - if (state->crtcs[i]) - commit->crtcs |= 1 << drm_crtc_index(state->crtcs[i]); - } + for_each_crtc_in_state(state, crtc, crtc_state, i) + commit->crtcs |= 1 << drm_crtc_index(crtc); wait_event(priv->commit.wait, !omap_atomic_is_pending(priv, commit));