From patchwork Thu Sep 15 18:30:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9334947 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 0BCD1607FD for ; Fri, 16 Sep 2016 01:09:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1D9129C52 for ; Fri, 16 Sep 2016 01:09:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E673529E81; Fri, 16 Sep 2016 01:09:53 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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]) (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 5E17129C52 for ; Fri, 16 Sep 2016 01:09:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 23EC26E96B; Fri, 16 Sep 2016 01:09:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-x244.google.com (mail-pa0-x244.google.com [IPv6:2607:f8b0:400e:c03::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0973F6E905 for ; Thu, 15 Sep 2016 18:31:06 +0000 (UTC) Received: by mail-pa0-x244.google.com with SMTP id pp5so2414161pac.2 for ; Thu, 15 Sep 2016 11:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yPZwiPLCqLPKgNl22TuTC2kjaxLuPCB3iAUdQhsMtjY=; b=C8Ox7fOSqfTCw/kBJmgBoat6FMb9x83ycVPfSVo6pWyJF465oDxLhWZGW/lsnk5zjY 2RXIsNJvSJxvJO49uABQVnCd5dxt2K+7viMBHfsx9QJEp6q46UGmW0ixolcz4wtdUjyX 06fxUb7PVFCVcdZCobrAJwwZX4hrncchgoD5CRASTIhdA3L3R2xdOvvhDiLtG5RVYDLc wSuB5SblRNgPAzzznobETIH7vWIM6CEJ9yUlpwGf8Ta5mVUAucStObJP61wOkKsbfcKV sjjlBFYFNYY6DtQeNnvOOh4L5u6jj3Q6Alx6ZzzDYiQ+SL2aqLLghPWb4cO/8crsjd94 ehBQ== 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=yPZwiPLCqLPKgNl22TuTC2kjaxLuPCB3iAUdQhsMtjY=; b=cYdloVaJXVbLP6Ti8UDeDV0BcRXDAdN1TQreI6vDxTphTskxtk4Mbr9REqgD2nrptg lcVCynMNtjzgj7zZ6E5hOXqaN74vSlPs0aVQS3nULWFCRajKaOuCJYkn3N64zUF6nTd2 yBrc1pfhqkP2unqw+SKn3qe7xP389wFfEl7qJpXlTecO8+lzm8MMMXIARUnN9SwqOvHW 2zB9SuB9846bZIfDoafkurDiPKtzFQONNXrl9ACO/dfnOYcwLigJRcnVm3KPWqVRb1h3 TFH/1wbHlzwW270qhQjuwu9xNr0tLwTFods/BcqeCL5QQMDktCx8Uy53aP+d0r8mMF+L BeuA== X-Gm-Message-State: AE9vXwMoEQp2B5qUOtsHnhPk7y5oOThkZK0QTV8eJonHtAqkKjNkACV85LdiTqhgaGgfpA== X-Received: by 10.66.82.42 with SMTP id f10mr16818010pay.17.1473964264756; Thu, 15 Sep 2016 11:31:04 -0700 (PDT) Received: from majic.world.mentorg.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id yu7sm6680554pab.45.2016.09.15.11.31.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Sep 2016 11:31:04 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: p.zabel@pengutronix.de, tomi.valkeinen@ti.com Subject: [PATCH v6 2/3] gpu: ipu-v3: Add ipu_rot_mode_is_irt() Date: Thu, 15 Sep 2016 11:30:50 -0700 Message-Id: <1473964251-20662-3-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473964251-20662-1-git-send-email-steve_longerbeam@mentor.com> References: <1473964251-20662-1-git-send-email-steve_longerbeam@mentor.com> X-Mailman-Approved-At: Fri, 16 Sep 2016 01:09:16 +0000 Cc: linux-fbdev@vger.kernel.org, Steve Longerbeam , dri-devel@lists.freedesktop.org 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 Add a macro that returns boolean true if the given ipu_rotate_mode requires the use of the Image Rotator. Signed-off-by: Steve Longerbeam --- drivers/gpu/ipu-v3/ipu-ic.c | 2 +- include/video/imx-ipu-v3.h | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c index 1a37afc..321eb98 100644 --- a/drivers/gpu/ipu-v3/ipu-ic.c +++ b/drivers/gpu/ipu-v3/ipu-ic.c @@ -619,7 +619,7 @@ int ipu_ic_task_idma_init(struct ipu_ic *ic, struct ipuv3_channel *channel, ipu_ic_write(ic, ic_idmac_2, IC_IDMAC_2); ipu_ic_write(ic, ic_idmac_3, IC_IDMAC_3); - if (rot >= IPU_ROTATE_90_RIGHT) + if (ipu_rot_mode_is_irt(rot)) ic->rotation = true; unlock: diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h index 49d5439..f39a3d6 100644 --- a/include/video/imx-ipu-v3.h +++ b/include/video/imx-ipu-v3.h @@ -63,17 +63,25 @@ enum ipu_csi_dest { /* * Enumeration of IPU rotation modes */ +#define IPU_ROT_BIT_VFLIP (1 << 0) +#define IPU_ROT_BIT_HFLIP (1 << 1) +#define IPU_ROT_BIT_90 (1 << 2) + enum ipu_rotate_mode { IPU_ROTATE_NONE = 0, - IPU_ROTATE_VERT_FLIP, - IPU_ROTATE_HORIZ_FLIP, - IPU_ROTATE_180, - IPU_ROTATE_90_RIGHT, - IPU_ROTATE_90_RIGHT_VFLIP, - IPU_ROTATE_90_RIGHT_HFLIP, - IPU_ROTATE_90_LEFT, + IPU_ROTATE_VERT_FLIP = IPU_ROT_BIT_VFLIP, + IPU_ROTATE_HORIZ_FLIP = IPU_ROT_BIT_HFLIP, + IPU_ROTATE_180 = (IPU_ROT_BIT_VFLIP | IPU_ROT_BIT_HFLIP), + IPU_ROTATE_90_RIGHT = IPU_ROT_BIT_90, + IPU_ROTATE_90_RIGHT_VFLIP = (IPU_ROT_BIT_90 | IPU_ROT_BIT_VFLIP), + IPU_ROTATE_90_RIGHT_HFLIP = (IPU_ROT_BIT_90 | IPU_ROT_BIT_HFLIP), + IPU_ROTATE_90_LEFT = (IPU_ROT_BIT_90 | + IPU_ROT_BIT_VFLIP | IPU_ROT_BIT_HFLIP), }; +/* 90-degree rotations require the IRT unit */ +#define ipu_rot_mode_is_irt(m) (((m) & IPU_ROT_BIT_90) != 0) + enum ipu_color_space { IPUV3_COLORSPACE_RGB, IPUV3_COLORSPACE_YUV,