From: Rob Herring <robh@kernel.org>
To: dri-devel@lists.freedesktop.org
Cc: Robert Foss <robert.foss@collabora.com>
Subject: [PATCH hwc] drm_hwcomposer: use upstream DRM_MODE_{ROTATE, REFLECT} defines
Date: Fri, 6 Oct 2017 16:46:48 -0500 [thread overview]
Message-ID: <20171006214648.2077-1-robh@kernel.org> (raw)
The DRM_REFLECT_* and DRM_ROTATE_* defines were not upstream, but now
they are. Convert to using the upstream version which are defined as a
bit mask rather than a bit position.
Signed-off-by: Rob Herring <robh@kernel.org>
---
drmdisplaycompositor.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index a07d3588d1f5..036a45e8b88b 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -572,15 +572,15 @@ int DrmDisplayCompositor::CommitFrame(DrmDisplayComposition *display_comp,
rotation = 0;
if (layer.transform & DrmHwcTransform::kFlipH)
- rotation |= 1 << DRM_REFLECT_X;
+ rotation |= DRM_MODE_REFLECT_X;
if (layer.transform & DrmHwcTransform::kFlipV)
- rotation |= 1 << DRM_REFLECT_Y;
+ rotation |= DRM_MODE_REFLECT_Y;
if (layer.transform & DrmHwcTransform::kRotate90)
- rotation |= 1 << DRM_ROTATE_90;
+ rotation |= DRM_MODE_ROTATE_90;
else if (layer.transform & DrmHwcTransform::kRotate180)
- rotation |= 1 << DRM_ROTATE_180;
+ rotation |= DRM_MODE_ROTATE_180;
else if (layer.transform & DrmHwcTransform::kRotate270)
- rotation |= 1 << DRM_ROTATE_270;
+ rotation |= DRM_MODE_ROTATE_270;
if (fence_fd < 0) {
int prop_id = plane->in_fence_fd_property().id();
--
2.11.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2017-10-06 21:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-06 21:46 Rob Herring [this message]
2017-10-06 23:29 ` [PATCH hwc] drm_hwcomposer: use upstream DRM_MODE_{ROTATE, REFLECT} defines Thierry Reding
2017-10-09 14:04 ` Robert Foss
2017-10-09 11:20 ` [PATCH hwc] drm_hwcomposer: use upstream DRM_MODE_{ROTATE,REFLECT} defines Robert Foss
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=20171006214648.2077-1-robh@kernel.org \
--to=robh@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=robert.foss@collabora.com \
/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