lineage-rockchip/android_external_drm_hwcomposer
1
0
Fork 0
Code Activity Actions

drm_hwcomposer: Fix DRM and HWC rotation direction misalignment

Browse source 
[DRM API][1] uses a counter-clockwise direction, while [HWC API][2] uses
a clockwise.

[1]: https://elixir.bootlin.com/linux/v6.5.7/source/include/uapi/drm/drm_mode.h#L172
[2]: https://cs.android.com/android/platform/superproject/main/+/main:hardware/libhardware/include_all/hardware/hwcomposer_defs.h;l=96;drc=e9d7337d9d1edc0d8e3ece246ecde747e345e876
Closes: https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer/-/issues/78
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
This commit is contained in:
Roman Stratiienko 2023-10-15 01:52:00 +03:00
parent 492739c5b3
commit b9bd2712fb
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compositor/LayerData.h
View file

@ -33,6 +33,7 @@ namespace android {
class DrmFbIdHandle; class DrmFbIdHandle;
/* Rotation is defined in the clockwise direction */
enum LayerTransform : uint32_t { enum LayerTransform : uint32_t {
kIdentity = 0, kIdentity = 0,
kFlipH = 1 << 0, kFlipH = 1 << 0,

14
drm/DrmPlane.cpp
View file

@ -88,14 +88,17 @@ int DrmPlane::Init() {
GetPlaneProperty("zpos", zpos_property_, Presence::kOptional); GetPlaneProperty("zpos", zpos_property_, Presence::kOptional);
/* DRM/KMS uses counter-clockwise rotations, while HWC API uses
* clockwise. That's why 90 and 270 are swapped here.
*/
if (GetPlaneProperty("rotation", rotation_property_, Presence::kOptional)) { if (GetPlaneProperty("rotation", rotation_property_, Presence::kOptional)) {
rotation_property_.AddEnumToMap("rotate-0", LayerTransform::kIdentity, rotation_property_.AddEnumToMap("rotate-0", LayerTransform::kIdentity,
transform_enum_map_); transform_enum_map_);
rotation_property_.AddEnumToMap("rotate-90", LayerTransform::kRotate90, rotation_property_.AddEnumToMap("rotate-90", LayerTransform::kRotate270,
transform_enum_map_); transform_enum_map_);
rotation_property_.AddEnumToMap("rotate-180", LayerTransform::kRotate180, rotation_property_.AddEnumToMap("rotate-180", LayerTransform::kRotate180,
transform_enum_map_); transform_enum_map_);
rotation_property_.AddEnumToMap("rotate-270", LayerTransform::kRotate270, rotation_property_.AddEnumToMap("rotate-270", LayerTransform::kRotate90,
transform_enum_map_); transform_enum_map_);
rotation_property_.AddEnumToMap("reflect-x", LayerTransform::kFlipH, rotation_property_.AddEnumToMap("reflect-x", LayerTransform::kFlipH,
transform_enum_map_); transform_enum_map_);
@ -220,16 +223,19 @@ bool DrmPlane::HasNonRgbFormat() const {
static uint64_t ToDrmRotation(LayerTransform transform) { static uint64_t ToDrmRotation(LayerTransform transform) {
uint64_t rotation = 0; uint64_t rotation = 0;
/* DRM/KMS uses counter-clockwise rotations, while HWC API uses
* clockwise. That's why 90 and 270 are swapped here.
*/
if ((transform & LayerTransform::kFlipH) != 0) if ((transform & LayerTransform::kFlipH) != 0)
rotation |= DRM_MODE_REFLECT_X; rotation |= DRM_MODE_REFLECT_X;
if ((transform & LayerTransform::kFlipV) != 0) if ((transform & LayerTransform::kFlipV) != 0)
rotation |= DRM_MODE_REFLECT_Y; rotation |= DRM_MODE_REFLECT_Y;
if ((transform & LayerTransform::kRotate90) != 0) if ((transform & LayerTransform::kRotate90) != 0)
rotation |= DRM_MODE_ROTATE_90; rotation |= DRM_MODE_ROTATE_270;
else if ((transform & LayerTransform::kRotate180) != 0) else if ((transform & LayerTransform::kRotate180) != 0)
rotation |= DRM_MODE_ROTATE_180; rotation |= DRM_MODE_ROTATE_180;
else if ((transform & LayerTransform::kRotate270) != 0) else if ((transform & LayerTransform::kRotate270) != 0)
rotation |= DRM_MODE_ROTATE_270; rotation |= DRM_MODE_ROTATE_90;
else else
rotation |= DRM_MODE_ROTATE_0; rotation |= DRM_MODE_ROTATE_0;