drm_hwcomposer: use upstream DRM_MODE_{ROTATE, REFLECT} defines
PATCH 1/1 drm_hwcomposer: use upstream DRM_MODE_{ROTATE, REFLECT} defines
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.
--- drmdisplaycompositor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drmdisplaycompositor.cpp +5 -5
@@ -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();
Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 8 lines · Rob Herring
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 <[email protected]>--- drmdisplaycompositor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hey Thierry,
Quoted 7 lines · Thierry Reding
Quoted 6 lines · Rob Herring
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.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Rob Herring <[email protected]>---
drmdisplaycompositor.cpp | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)Reviewed-by Thierry Reding <[email protected]>
I pushed this patch, but I slightly bungled it, and missed appending your r-b to the commit message. Sorry about that.
Rob.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH hwc] drm_hwcomposer: use upstream DRM_MODE_{ROTATE,REFLECT} defines
In reply to Rob HerringHey Rob,
This looks good to me, added r-b and pushed.
Rob.
Quoted 29 lines · Rob Herring
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 <[email protected]>---
drmdisplaycompositor.cpp | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)drmdisplaycompositor.cpp +0
-0@@ -572,15 +572,15 @@ intDrmDisplayCompositor::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)
Quoted 8 lines
- 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) {
intprop_id= plane->in_fence_fd_property().id();
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel