aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-17 20:43:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-17 20:43:39 +0000
commitd4f1c30a4f3d6c53ed8e41af5bef853b27aebfc5 (patch)
tree50f0a6ec99e280d7054e341509839ca431381b99
parent116d5b2822d5459d2248928acd586f72b716c4ba (diff)
parentc1e387f96e79db552180669bfd4e7e40457af715 (diff)
downloadplatform_external_igt-gpu-tools-d4f1c30a4f3d6c53ed8e41af5bef853b27aebfc5.tar.gz
platform_external_igt-gpu-tools-d4f1c30a4f3d6c53ed8e41af5bef853b27aebfc5.tar.bz2
platform_external_igt-gpu-tools-d4f1c30a4f3d6c53ed8e41af5bef853b27aebfc5.zip
igt-gpu-tools: respect display's max alpha am: 05b972fad5 am: c1e387f96e
Change-Id: I8c0b4a76a826c28d9db87d9b60a04dbd469b7d17
-rw-r--r--lib/igt_kms.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index eb06e2b3..4dfcc737 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1832,7 +1832,24 @@ static void igt_plane_reset(igt_plane_t *plane)
igt_plane_set_prop_enum(plane, IGT_PLANE_PIXEL_BLEND_MODE, "Pre-multiplied");
if (igt_plane_has_prop(plane, IGT_PLANE_ALPHA))
- igt_plane_set_prop_value(plane, IGT_PLANE_ALPHA, 0xffff);
+ {
+ uint64_t max_alpha = 0xffff;
+ drmModePropertyPtr alpha_prop = drmModeGetProperty(
+ plane->pipe->display->drm_fd,
+ plane->props[IGT_PLANE_ALPHA]);
+
+ if (alpha_prop)
+ {
+ if (alpha_prop->flags & DRM_MODE_PROP_RANGE)
+ {
+ max_alpha = alpha_prop->values[1];
+ }
+
+ drmModeFreeProperty(alpha_prop);
+ }
+
+ igt_plane_set_prop_value(plane, IGT_PLANE_ALPHA, max_alpha);
+ }
igt_plane_clear_prop_changed(plane, IGT_PLANE_IN_FENCE_FD);