From patchwork Fri Apr 22 13:54:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 8912121 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39C0FBF29F for ; Fri, 22 Apr 2016 13:55:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5730F201F5 for ; Fri, 22 Apr 2016 13:55:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 496EE20221 for ; Fri, 22 Apr 2016 13:55:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BDC696EEF1; Fri, 22 Apr 2016 13:55:17 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 45EE96EEF1 for ; Fri, 22 Apr 2016 13:55:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id ADB27260B82 From: robert.foss@collabora.com To: daniel.vetter@intel.com Date: Fri, 22 Apr 2016 09:54:53 -0400 Message-Id: <1461333296-9226-4-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461333296-9226-1-git-send-email-robert.foss@collabora.com> References: <1461333296-9226-1-git-send-email-robert.foss@collabora.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH i-g-t v2 3/6] lib/igt_kms: Fix plane counting in igt_display_init. 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=-5.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 From: Robert Foss Fix issue where the plane counting fails due to the number and configuration of planes being unlike the intel configuration. Signed-off-by: Robert Foss --- lib/igt_kms.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 36ecd4a..5751913 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1289,6 +1289,7 @@ void igt_display_init(igt_display_t *display, int drm_fd) igt_plane_t *plane; int p = IGT_PLANE_2; int j, type; + uint8_t n_planes = 0; pipe->crtc_id = resources->crtcs[i]; pipe->display = display; @@ -1336,8 +1337,10 @@ void igt_display_init(igt_display_t *display, int drm_fd) break; } + n_planes++; plane->pipe = pipe; plane->drm_plane = drm_plane; + if (is_atomic == 0) { display->is_atomic = 1; igt_atomic_fill_plane_props(display, plane, IGT_NUM_PLANE_PROPS, igt_plane_prop_names); @@ -1386,8 +1389,7 @@ void igt_display_init(igt_display_t *display, int drm_fd) plane->is_cursor = true; } - /* planes = 1 primary, (p-1) sprites, 1 cursor */ - pipe->n_planes = p + 1; + pipe->n_planes = n_planes; /* make sure we don't overflow the plane array */ igt_assert(pipe->n_planes <= IGT_MAX_PLANES);