From patchwork Fri Feb 17 17:54:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Starkey X-Patchwork-Id: 9580469 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 1454E600C5 for ; Fri, 17 Feb 2017 17:54:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 087B628742 for ; Fri, 17 Feb 2017 17:54:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1BED28764; Fri, 17 Feb 2017 17:54:45 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BF51228742 for ; Fri, 17 Feb 2017 17:54:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54BAD6ED98; Fri, 17 Feb 2017 17:54:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B2636ED92 for ; Fri, 17 Feb 2017 17:54:40 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 12D1C54C; Fri, 17 Feb 2017 09:54:40 -0800 (PST) Received: from e106950-lin.cambridge.arm.com (e106950-lin.cambridge.arm.com [10.2.133.193]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 75FB53F578; Fri, 17 Feb 2017 09:54:39 -0800 (PST) From: Brian Starkey To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Feb 2017 17:54:30 +0000 Message-Id: <1487354070-14487-5-git-send-email-brian.starkey@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1487354070-14487-1-git-send-email-brian.starkey@arm.com> References: <1487354070-14487-1-git-send-email-brian.starkey@arm.com> Subject: [Intel-gfx] [PATCH i-g-t 5/5] lib/igt_kms: Remove redundant cursor code 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-Virus-Scanned: ClamAV using ClamSMTP The dynamic plane support means that there should never be gaps in the pipe->planes array. This means we should never need to move the cursor plane from the last slot to another. Remove the unnecessary code, and add an assert that makes sure nothing strange happened that broke the assignment logic. Signed-off-by: Brian Starkey Reviewed-by: Robert Foss --- lib/igt_kms.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index ef7bfd1a8108..6fbe67139d98 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1824,20 +1824,11 @@ void igt_display_init(igt_display_t *display, int drm_fd) */ igt_assert_eq(pipe->plane_primary, 0); - if (display->has_cursor_plane) { - /* - * Cursor was put in the last slot. If we have 0 or - * only 1 sprite, that's the wrong slot and we need to - * move it down. - */ - if (p != last_plane) { - pipe->planes[p] = - pipe->planes[last_plane]; - pipe->planes[p].index = p; - memset(&pipe->planes[last_plane], 0, - sizeof *plane); - } - } + /* + * There should be no gaps. If there is, something happened + * which we can't handle (e.g. all planes are cursors). + */ + igt_assert_eq(p, last_plane); pipe->n_planes = n_planes;