Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1485596
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Steve Longerbeam <slongerbeam@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v7 2/3] gpu: ipu-v3: Add ipu_rot_mode_is_irt() |
| Date | Sat, 17 Sep 2016 21:40:01 +0200 |
| Message-ID | <sitCV-6z5-9@gated-at.bofh.it> (permalink) |
| References | <sitCV-6z5-5@gated-at.bofh.it> |
| X-Original-To | p.zabel@pengutronix.de, tomi.valkeinen@ti.com |
| 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=pM2N+LtBc+hCAIOgOopomMJQtsrNdBt48ytLFcSDmeS4KXjYMvq/zW0jHjhxhoiahX JuFykW8C60SMNCMSXCGGOUVXSa7kw+XtKrNH8eTw5EpqkTLOObh86iCNfKEXVO1swSdB QzAgbeUeetuEoRwS6ovQaNJhjKnYM6toFVbJLs3ra7tP43leKANikp8ej1v5Jjyg1BQG o+cfg0SUGZXkmF8grYs6/V3hXAi+6ZuOFXPOf+85qbE+6L/a6abYS3u5il6pq4JYy4Wd veKvynyPdF1a6mFCCRFb4lL6VL7EB3TKGhUgj3HTDlcsBIMGmbFLVLX8YPP31s+LogPl hTXQ== |
| 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=M8ltit2pvYpY7SRq7wnBeNC/Bi2JBBmx3ick0odYsjZrSMH31ez1BBDRKHrsJf6ZyH bgiRq6WPuw8iw+8GXq8AWoUKRUkv0R+w2Ogsdfd1jipTK5Ta2z3wwcnXEnz62A4Dp8D3 B713e3c3j552EfVAYoEtEtY+l97iEkP6wc0Z/KRvjBwZ1wFJ+5q4eznfXyrlfLlE80jj IzYfTiM8IdiPAzLYQj0eaFmwOUyHT0wcD1YBHNYgCNWafJGOB2CMkgr2S1qMSHSv8Pag RgNs/t/VIU1oyU5fSoOct3L1WytDJ4om2Ny5xr9BiNM0tslU3XfOLpjyrKcnENIQbzPT X0aA== |
| X-Gm-Message-State | AE9vXwNZOIJKvRsxVOETpENnl+D+ADkGHwsYeNaI29mjBPp7blj19rXKUw6TCj3BZvCJ+A== |
| X-Received | by 10.98.94.6 with SMTP id s6mr33572565pfb.31.1474140848503; Sat, 17 Sep 2016 12:34:08 -0700 (PDT) |
| X-Google-Original-From | Steve Longerbeam <steve_longerbeam@mentor.com> |
| X-Mailer | git-send-email 2.7.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 61 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, Steve Longerbeam <steve_longerbeam@mentor.com> |
| X-Original-Date | Sat, 17 Sep 2016 12:33:57 -0700 |
| X-Original-Message-ID | <1474140838-1082-3-git-send-email-steve_longerbeam@mentor.com> |
| X-Original-References | <1474140838-1082-1-git-send-email-steve_longerbeam@mentor.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1485596 |
Show key headers only | View raw
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 <steve_longerbeam@mentor.com>
---
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,
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v7 0/3] IPUv3 prep for i.MX5/6 v4l2 staging drivers, v7 Steve Longerbeam <slongerbeam@gmail.com> - 2016-09-17 21:40 +0200 [PATCH v7 2/3] gpu: ipu-v3: Add ipu_rot_mode_is_irt() Steve Longerbeam <slongerbeam@gmail.com> - 2016-09-17 21:40 +0200 Re: [PATCH v7 0/3] IPUv3 prep for i.MX5/6 v4l2 staging drivers, v7 Philipp Zabel <p.zabel@pengutronix.de> - 2016-09-19 09:40 +0200
csiph-web