diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-10-05 08:56:03 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-10-20 11:44:36 +0200 |
commit | 162fe75c2c422aa3b3f6e9ba7fc7e997602ab31f (patch) | |
tree | 0b923e827b7e317ea768ef91bd3f003ba8518845 /lib | |
parent | c800cedb3fdaea8898085d3060a1ab8267f627aa (diff) |
tests/kms_color: Rework tests slightly to work better with new atomic api
igt_pipe_get_property is about to be removed, so use
igt_pipe_obj_get_prop instead. This requires adding 2 more properties
to the crtc property list. Also get rid of the Broadcast RGB call,
this is already handled in igt_kms.
Change order for DEGAMMA_LUT and GAMMA_LUT around, else this test will
fail if legacy gamma is set. In the legacy path, this will update
GAMMA_LUT to the new size before DEGAMMA_LUT is set.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/igt_kms.c | 4 | ||||
-rw-r--r-- | lib/igt_kms.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 9cf4b68f..cb2bc2b8 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -177,8 +177,10 @@ const char *igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = { const char *igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = { "background_color", "CTM", - "DEGAMMA_LUT", "GAMMA_LUT", + "GAMMA_LUT_SIZE", + "DEGAMMA_LUT", + "DEGAMMA_LUT_SIZE", "MODE_ID", "ACTIVE", "OUT_FENCE_PTR" diff --git a/lib/igt_kms.h b/lib/igt_kms.h index e722f0be..200f35e6 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -95,8 +95,10 @@ void kmstest_restore_vt_mode(void); enum igt_atomic_crtc_properties { IGT_CRTC_BACKGROUND = 0, IGT_CRTC_CTM, - IGT_CRTC_DEGAMMA_LUT, IGT_CRTC_GAMMA_LUT, + IGT_CRTC_GAMMA_LUT_SIZE, + IGT_CRTC_DEGAMMA_LUT, + IGT_CRTC_DEGAMMA_LUT_SIZE, IGT_CRTC_MODE_ID, IGT_CRTC_ACTIVE, IGT_CRTC_OUT_FENCE_PTR, |