From: ville.syrjala@linux.intel.com
To: dri-devel@lists.freedesktop.org
Cc: Jilai Wang <jilaiw@codeaurora.org>,
intel-gfx@lists.freedesktop.org,
Archit Taneja <architt@codeaurora.org>
Subject: [PATCH v2 10/15] drm/msm/mdp5: Advertize 180 degree rotation
Date: Mon, 26 Sep 2016 19:30:55 +0300 [thread overview]
Message-ID: <1474907460-10717-11-git-send-email-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <1474907460-10717-1-git-send-email-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Since the hardware can apparently do both X and Y reflection, we
can advertize also 180 degree rotation as thats just X+Y reflection.
v2: Drop the BIT()
Cc: Rob Clark <robdclark@gmail.com>
Cc: Jilai Wang <jilaiw@codeaurora.org>
Cc: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index 2653ad893ebc..cf50d3ec8d1b 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -78,6 +78,7 @@ static void mdp5_plane_install_rotation_property(struct drm_device *dev,
drm_plane_create_rotation_property(plane,
DRM_ROTATE_0,
DRM_ROTATE_0 |
+ DRM_ROTATE_180 |
DRM_REFLECT_X |
DRM_REFLECT_Y);
}
@@ -285,6 +286,8 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
plane_enabled(old_state), plane_enabled(state));
if (plane_enabled(state)) {
+ unsigned int rotation;
+
format = to_mdp_format(msm_framebuffer_format(state->fb));
if (MDP_FORMAT_IS_YUV(format) &&
!pipe_supports_yuv(mdp5_plane->caps)) {
@@ -305,8 +308,13 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
return -EINVAL;
}
- hflip = !!(state->rotation & DRM_REFLECT_X);
- vflip = !!(state->rotation & DRM_REFLECT_Y);
+ rotation = drm_rotation_simplify(state->rotation,
+ DRM_ROTATE_0 |
+ DRM_REFLECT_X |
+ DRM_REFLECT_Y);
+ hflip = !!(rotation & DRM_REFLECT_X);
+ vflip = !!(rotation & DRM_REFLECT_Y);
+
if ((vflip && !(mdp5_plane->caps & MDP_PIPE_CAP_VFLIP)) ||
(hflip && !(mdp5_plane->caps & MDP_PIPE_CAP_HFLIP))) {
dev_err(plane->dev->dev,
@@ -677,6 +685,7 @@ static int mdp5_plane_mode_set(struct drm_plane *plane,
int pe_top[COMP_MAX], pe_bottom[COMP_MAX];
uint32_t hdecm = 0, vdecm = 0;
uint32_t pix_format;
+ unsigned int rotation;
bool vflip, hflip;
unsigned long flags;
int ret;
@@ -739,8 +748,12 @@ static int mdp5_plane_mode_set(struct drm_plane *plane,
config |= get_scale_config(format, src_h, crtc_h, false);
DBG("scale config = %x", config);
- hflip = !!(pstate->rotation & DRM_REFLECT_X);
- vflip = !!(pstate->rotation & DRM_REFLECT_Y);
+ rotation = drm_rotation_simplify(pstate->rotation,
+ DRM_ROTATE_0 |
+ DRM_REFLECT_X |
+ DRM_REFLECT_Y);
+ hflip = !!(rotation & DRM_REFLECT_X);
+ vflip = !!(rotation & DRM_REFLECT_Y);
spin_lock_irqsave(&mdp5_plane->pipe_lock, flags);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-09-26 16:30 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 16:30 [PATCH v2 00/16] drm: drm: Per-plane rotation etc ville.syrjala
2016-09-26 16:30 ` [PATCH v2 01/15] drm: Add drm_rotation_90_or_270() ville.syrjala
2016-09-27 9:32 ` Joonas Lahtinen
2016-09-26 16:30 ` [PATCH 02/15] drm/atomic: Reject attempts to use multiple rotation angles at once ville.syrjala
2016-09-26 16:30 ` [PATCH v3 03/15] drm: Add support for optional per-plane rotation property ville.syrjala
2016-09-27 9:54 ` [Intel-gfx] " Joonas Lahtinen
2016-09-27 10:22 ` Ville Syrjälä
2016-10-21 16:23 ` Daniel Vetter
2016-09-26 16:30 ` [PATCH v2 04/15] drm/arm: Use " ville.syrjala
2016-09-26 16:30 ` [PATCH v3 05/15] drm/atmel-hlcdc: " ville.syrjala
2016-09-26 16:30 ` [PATCH v2 06/15] drm/omap: Set rotation property initial value to BIT(DRM_ROTATE_0) insted of 0 ville.syrjala
2016-09-26 16:30 ` [PATCH v2 07/15] drm/omap: Use per-plane rotation property ville.syrjala
2016-10-06 9:59 ` Tomi Valkeinen
2016-10-06 10:30 ` Ville Syrjälä
2016-10-06 10:32 ` Tomi Valkeinen
2016-09-26 16:30 ` [PATCH v2 08/15] drm/msm/mdp5: Set rotation property initial value to BIT(DRM_ROTATE_0) insted of 0 ville.syrjala
2016-10-21 16:26 ` Daniel Vetter
2016-10-21 16:40 ` Ville Syrjälä
2016-09-26 16:30 ` [PATCH v2 09/15] drm/msm/mdp5: Use per-plane rotation property ville.syrjala
2016-09-26 16:30 ` ville.syrjala [this message]
2016-09-26 16:30 ` [PATCH v3 11/15] drm/i915: Use the " ville.syrjala
2016-09-27 9:58 ` Joonas Lahtinen
2016-10-21 16:28 ` [Intel-gfx] " Daniel Vetter
2016-09-26 16:30 ` [PATCH v2 12/15] drm: RIP mode_config->rotation_property ville.syrjala
2016-09-27 10:00 ` [Intel-gfx] " Joonas Lahtinen
2016-09-26 16:30 ` [PATCH v2 13/15] drm/i915: Use & instead if == to check for rotations ville.syrjala
2016-09-26 16:30 ` [PATCH v2 14/15] drm/i915: Clean up rotation DSPCNTR/DVSCNTR/etc. setup ville.syrjala
2016-09-26 16:31 ` [PATCH v2 15/15] drm/i915: Add horizontal mirroring support for CHV pipe B planes ville.syrjala
2016-09-27 10:02 ` [Intel-gfx] " Joonas Lahtinen
2016-09-26 16:40 ` [PATCH v2 00/16] drm: drm: Per-plane rotation etc Ville Syrjälä
2016-09-26 17:12 ` Rob Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474907460-10717-11-git-send-email-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=architt@codeaurora.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jilaiw@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).