From patchwork Fri Mar 29 02:45:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 2363901 Return-Path: X-Original-To: patchwork-ltsi-dev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by patchwork1.kernel.org (Postfix) with ESMTP id 5DE2E3FD40 for ; Fri, 29 Mar 2013 02:59:40 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [IPv6:::1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 73CDBEE4; Fri, 29 Mar 2013 02:48:12 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8A60BB90 for ; Fri, 29 Mar 2013 02:48:00 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from kirsty.vergenet.net (kirsty.vergenet.net [202.4.237.240]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id A93DC20180 for ; Fri, 29 Mar 2013 02:47:56 +0000 (UTC) Received: from ayumi.akashicho.tokyo.vergenet.net (p8120-ipbfp1001kobeminato.hyogo.ocn.ne.jp [118.10.137.120]) by kirsty.vergenet.net (Postfix) with ESMTP id 6E2A12C6AA1; Fri, 29 Mar 2013 13:46:06 +1100 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 13AA0EDEA21; Fri, 29 Mar 2013 11:46:04 +0900 (JST) From: Simon Horman To: ltsi-dev@lists.linuxfoundation.org Date: Fri, 29 Mar 2013 11:45:05 +0900 Message-Id: <1364525119-31791-377-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364525119-31791-1-git-send-email-horms+renesas@verge.net.au> References: <1364525119-31791-1-git-send-email-horms+renesas@verge.net.au> X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Magnus Damm Subject: [LTSI-dev] [PATCH/RFC 376/390] drm/rcar-du: Fix plane index wrap-around for multi-planar overlays X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org From: Laurent Pinchart If the first hardware plane of a multi-planar overlay is plane 7 the second hardware plane will be plane 0. Handle the wrap-around when configuring plane priorities. Signed-off-by: Laurent Pinchart (cherry picked from commit 3e2857ce3666ef97ea5abf0ce7268ee5d8b4311d) Signed-off-by: Simon Horman --- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 22b87ec..ca80939 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -142,13 +142,16 @@ void rcar_du_crtc_update_planes(struct drm_crtc *crtc) for (i = 0; i < num_planes; ++i) { struct rcar_du_plane *plane = planes[i]; + unsigned int index = plane->hwindex; prio -= 4; - dspr |= (plane->hwindex + 1) << prio; + dspr |= (index + 1) << prio; if (plane->format->planes == 2) { + index = (index + 1) % 8; + prio -= 4; - dspr |= (plane->hwindex + 2) << prio; + dspr |= (index + 1) << prio; } }