Re: [PATCH i-g-t v3 07/11] lib/igt_kms: Add support for the OUT_FENCE_PTR property

Brian Starkey
2017-01-31T16:49:49Z

On Mon, Jan 30, 2017 at 08:58:43PM -0500, Robert Foss wrote:
>From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
>Add support for the OUT_FENCE_PTR property to enable setting out fences for
>atomic commits.
>
>Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>Signed-off-by: Robert Foss <robert.foss@collabora.com>
>---
> lib/igt_kms.c | 26 +++++++++++++++++++++++++-
> lib/igt_kms.h | 6 +++++-
> 2 files changed, 30 insertions(+), 2 deletions(-)
>
>diff --git a/lib/igt_kms.c b/lib/igt_kms.c
>index b79d2867..f14496dd 100644
>--- a/lib/igt_kms.c
>+++ b/lib/igt_kms.c
>@@ -179,7 +179,8 @@ const char *igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = {
> "DEGAMMA_LUT",
> "GAMMA_LUT",
> "MODE_ID",
>- "ACTIVE"
>+ "ACTIVE",
>+ "OUT_FENCE_PTR"
> };
>
> const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
>@@ -2393,6 +2394,15 @@ static void igt_atomic_prepare_crtc_commit(igt_pipe_t *pipe_obj, drmModeAtomicRe
> igt_atomic_populate_crtc_req(req, pipe_obj, IGT_CRTC_ACTIVE, !!output);
> }
>
>+ pipe_obj->out_fence = -1;
>+ if (pipe_obj->out_fence_requested)
>+ {
>+ pipe_obj->out_fence_requested = false;
>+ igt_atomic_populate_crtc_req(req, pipe_obj, IGT_CRTC_OUT_FENCE_PTR,
>+ (uint64_t)(uintptr_t) &pipe_obj->out_fence);
>+ igt_assert_f(pipe_obj->out_fence != -1, "Unable to get fence, received -1 fd\n");

Doesn't this assertion always fail? You just set it to -1

>+ }
>+
> /*
> * TODO: Add all crtc level properties here
> */
>@@ -2984,6 +2994,20 @@ igt_pipe_set_gamma_lut(igt_pipe_t *pipe, void *ptr, size_t length)
> }
>
> /**
>+ * igt_pipe_set_out_fence_ptr:
>+ * @pipe: pipe pointer to which background color to be set
>+ * @fence_ptr: out fence pointer
>+ *
>+ * Sets the out fence pointer that will be passed to the kernel in
>+ * the atomic ioctl. When the kernel returns the out fence pointer
>+ * will contain the fd number of the out fence created by KMS.
>+ */
>+void igt_pipe_set_out_fence_ptr(igt_pipe_t *pipe, int64_t *fence_ptr)
>+{
>+ pipe->out_fence_ptr = fence_ptr;
>+}

Is this ever used? You seem to use &pipe_obj->out_fence
unconditionally above (and igt_pipe has no member named
out_fence_ptr).

I guess is left over from the previous API and needs to be removed?

>+
>+/**
> * igt_crtc_set_background:
> * @pipe: pipe pointer to which background color to be set
> * @background: background color value in BGR 16bpc
>diff --git a/lib/igt_kms.h b/lib/igt_kms.h
>index 85688853..9672dadc 100644
>--- a/lib/igt_kms.h
>+++ b/lib/igt_kms.h
>@@ -94,6 +94,7 @@ enum igt_atomic_crtc_properties {
> IGT_CRTC_GAMMA_LUT,
> IGT_CRTC_MODE_ID,
> IGT_CRTC_ACTIVE,
>+ IGT_CRTC_OUT_FENCE_PTR,
> IGT_NUM_CRTC_PROPS
> };
>
>@@ -341,6 +342,9 @@ struct igt_pipe {
>
> uint64_t mode_blob;
> bool mode_changed;
>+
>+ int64_t out_fence;
>+ bool out_fence_requested;
> };
>
> typedef struct {
>@@ -395,7 +399,7 @@ static inline bool igt_plane_supports_rotation(igt_plane_t *plane)
> {
> return plane->rotation_property != 0;
> }
>-
>+void igt_pipe_request_out_fence(igt_pipe_t *pipe);

Not implemented? I think this patch got confused somewhere :-(

-Brian

> void igt_pipe_set_degamma_lut(igt_pipe_t *pipe, void *ptr, size_t length);
> void igt_pipe_set_ctm_matrix(igt_pipe_t *pipe, void *ptr, size_t length);
> void igt_pipe_set_gamma_lut(igt_pipe_t *pipe, void *ptr, size_t length);
>--
>2.11.0.453.g787f75f05