From patchwork Mon Feb 20 11:02:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Starkey X-Patchwork-Id: 9582547 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 BFEB1604A0 for ; Mon, 20 Feb 2017 11:03:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2E88287E9 for ; Mon, 20 Feb 2017 11:03:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A808A287FA; Mon, 20 Feb 2017 11:03:02 +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 6EB13287E9 for ; Mon, 20 Feb 2017 11:03:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5B4B6E3AC; Mon, 20 Feb 2017 11:03:00 +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 F05946E3A6 for ; Mon, 20 Feb 2017 11:02:57 +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 D826154C; Mon, 20 Feb 2017 03:02:57 -0800 (PST) Received: from e106950-lin.cambridge.arm.com (e106950-lin.cambridge.arm.com [10.2.138.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 45C1F3F23B; Mon, 20 Feb 2017 03:02:57 -0800 (PST) From: Brian Starkey To: intel-gfx@lists.freedesktop.org Date: Mon, 20 Feb 2017 11:02:48 +0000 Message-Id: <1487588568-5033-5-git-send-email-brian.starkey@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1487588568-5033-1-git-send-email-brian.starkey@arm.com> References: <1487588568-5033-1-git-send-email-brian.starkey@arm.com> Subject: [Intel-gfx] [PATCH i-g-t v2 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 60c4c260bf2d..8751c97f7a06 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1679,20 +1679,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;