diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-06-30 10:24:28 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-07-26 14:50:21 +0200 |
| commit | 9f45ea116539f6c1ad8cd11cd627f091d63baa4b (patch) | |
| tree | 169ffe20c06958443cc46d534380c592fd00701e /lib/igt_kms.h | |
| parent | 5a63668766ac7645f6f019deb1e9fc7f2d8f2fa5 (diff) | |
igt_kms: Handle atomic pipe properties better.
Move properties to the pipe, they don't belong in the output
and make atomic commit use the pipes for crtc properties.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Diffstat (limited to 'lib/igt_kms.h')
| -rw-r--r-- | lib/igt_kms.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 3531dc20..b9e8d344 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -117,7 +117,6 @@ struct kmstest_connector_config { bool connector_scaling_mode_changed; uint64_t connector_dpms; bool connector_dpms_changed; - uint32_t atomic_props_crtc[IGT_NUM_CRTC_PROPS]; uint32_t atomic_props_connector[IGT_NUM_CONNECTOR_PROPS]; int pipe; unsigned valid_crtc_idx_mask; @@ -257,6 +256,9 @@ struct igt_pipe { bool enabled; int n_planes; igt_plane_t planes[IGT_MAX_PLANES]; + + uint32_t atomic_props_crtc[IGT_NUM_CRTC_PROPS]; + uint64_t background; /* Background color MSB BGR 16bpc LSB */ uint32_t background_changed : 1; uint32_t background_property; @@ -395,13 +397,13 @@ static inline bool igt_pipe_connector_valid(enum pipe pipe, /** * igt_atomic_populate_crtc_req: * @req: A pointer to drmModeAtomicReq - * @output: A pointer igt_output_t + * @pipe: A pointer igt_pipe_t * @prop: one of igt_atomic_crtc_properties * @value: the value to add */ -#define igt_atomic_populate_crtc_req(req, output, prop, value) \ - igt_assert_lt(0, drmModeAtomicAddProperty(req, output->config.crtc->crtc_id,\ - output->config.atomic_props_crtc[prop], value)) +#define igt_atomic_populate_crtc_req(req, pipe, prop, value) \ + igt_assert_lt(0, drmModeAtomicAddProperty(req, pipe->crtc_id,\ + pipe->atomic_props_crtc[prop], value)) /** * igt_atomic_populate_connector_req: * @req: A pointer to drmModeAtomicReq |