diff mbox

[i-g-t,v2,06/12] lib/igt_kms: Add support for the IN_FENCE_FD property

Message ID 20161214090509.15716-7-robert.foss@collabora.com (mailing list archive)
State New, archived
Headers show

Commit Message

Robert Foss Dec. 14, 2016, 9:05 a.m. UTC 
Add support dor the IN_FENCE_FD property to enable setting in fences for atomic
commits.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 lib/igt_kms.c | 20 ++++++++++++++++++++
 lib/igt_kms.h |  5 +++++
 2 files changed, 25 insertions(+)

Comments

Brian Starkey Dec. 14, 2016, 4:04 p.m. UTC | #1 
Hi,

On Wed, Dec 14, 2016 at 04:05:03AM -0500, Robert Foss wrote:
>Add support dor the IN_FENCE_FD property to enable setting in fences for atomic
>commits.
>
>Signed-off-by: Robert Foss <robert.foss@collabora.com>
>---
> lib/igt_kms.c | 20 ++++++++++++++++++++
> lib/igt_kms.h |  5 +++++
> 2 files changed, 25 insertions(+)
>
>diff --git a/lib/igt_kms.c b/lib/igt_kms.c
>index 8aaff5b8..8ca49d86 100644
>--- a/lib/igt_kms.c
>+++ b/lib/igt_kms.c
>@@ -164,6 +164,7 @@ const char *igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = {
> 	"CRTC_H",
> 	"FB_ID",
> 	"CRTC_ID",
>+	"IN_FENCE_FD",
> 	"type",
> 	"rotation"
> };
>@@ -1426,6 +1427,7 @@ void igt_display_init(igt_display_t *display, int drm_fd)
> 			n_planes++;
> 			plane->pipe = pipe;
> 			plane->drm_plane = drm_plane;
>+			plane->fence_fd = -1;
>
> 			if (is_atomic == 0) {
> 				display->is_atomic = 1;
>@@ -1712,6 +1714,11 @@ igt_atomic_prepare_plane_commit(igt_plane_t *plane, igt_pipe_t *pipe,
> 	    plane->index,
> 	    fb_id);
>
>+	if (plane->fence_fd >= 0) {
>+		uint64_t fence_fd = (int64_t) plane->fence_fd;
>+		igt_atomic_populate_plane_req(req, plane, IGT_PLANE_IN_FENCE_FD, fence_fd);

Should you reset plane->fence_fd to -1 here? Or tests should
explicitly clear it for each commit?

Cheers,
Brian
>+	}
>+
> 	if (plane->fb_changed) {
> 		igt_atomic_populate_plane_req(req, plane, IGT_PLANE_CRTC_ID, fb_id ? crtc_id : 0);
> 		igt_atomic_populate_plane_req(req, plane, IGT_PLANE_FB_ID, fb_id);
>@@ -2522,6 +2529,19 @@ void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb)
> 	plane->size_changed = true;
> }
>
>+/**
>+ * igt_plane_set_fence_fd:
>+ * @plane: plane
>+ * @fence_fd: fence fd, disable fence_fd by setting it to -1
>+ *
>+ * This function sets a fence fd to enable a commit to wait for some event to
>+ * occur before completing.
>+ */
>+void igt_plane_set_fence_fd(igt_plane_t *plane, uint32_t fence_fd)
>+{
>+	plane->fence_fd = fence_fd;
>+}
>+
> void igt_plane_set_position(igt_plane_t *plane, int x, int y)
> {
> 	igt_pipe_t *pipe = plane->pipe;
>diff --git a/lib/igt_kms.h b/lib/igt_kms.h
>index dbe81bcb..9766807c 100644
>--- a/lib/igt_kms.h
>+++ b/lib/igt_kms.h
>@@ -225,6 +225,7 @@ enum igt_atomic_plane_properties {
>
>        IGT_PLANE_FB_ID,
>        IGT_PLANE_CRTC_ID,
>+       IGT_PLANE_IN_FENCE_FD,
>        IGT_PLANE_TYPE,
>        IGT_PLANE_ROTATION,
>        IGT_NUM_PLANE_PROPS
>@@ -284,6 +285,9 @@ typedef struct {
> 	uint32_t src_h;
>
> 	igt_rotation_t rotation;
>+
>+	/* in fence fd */
>+	int32_t fence_fd;
> 	uint32_t atomic_props_plane[IGT_NUM_PLANE_PROPS];
> } igt_plane_t;
>
>@@ -367,6 +371,7 @@ 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);
>
> void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb);
>+void igt_plane_set_fence_fd(igt_plane_t *plane, uint32_t fence_fd);
> void igt_plane_set_position(igt_plane_t *plane, int x, int y);
> void igt_plane_set_size(igt_plane_t *plane, int w, int h);
> void igt_plane_set_rotation(igt_plane_t *plane, igt_rotation_t rotation);
>-- 
>2.11.0
>
Robert Foss Dec. 15, 2016, 12:36 p.m. UTC | #2 
On 2016-12-14 11:04 AM, Brian Starkey wrote:
> Hi,
>
> On Wed, Dec 14, 2016 at 04:05:03AM -0500, Robert Foss wrote:
>> Add support dor the IN_FENCE_FD property to enable setting in fences
>> for atomic
>> commits.
>>
>> Signed-off-by: Robert Foss <robert.foss@collabora.com>
>> ---
>> lib/igt_kms.c | 20 ++++++++++++++++++++
>> lib/igt_kms.h |  5 +++++
>> 2 files changed, 25 insertions(+)
>>
>> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
>> index 8aaff5b8..8ca49d86 100644
>> --- a/lib/igt_kms.c
>> +++ b/lib/igt_kms.c
>> @@ -164,6 +164,7 @@ const char
>> *igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = {
>>     "CRTC_H",
>>     "FB_ID",
>>     "CRTC_ID",
>> +    "IN_FENCE_FD",
>>     "type",
>>     "rotation"
>> };
>> @@ -1426,6 +1427,7 @@ void igt_display_init(igt_display_t *display,
>> int drm_fd)
>>             n_planes++;
>>             plane->pipe = pipe;
>>             plane->drm_plane = drm_plane;
>> +            plane->fence_fd = -1;
>>
>>             if (is_atomic == 0) {
>>                 display->is_atomic = 1;
>> @@ -1712,6 +1714,11 @@ igt_atomic_prepare_plane_commit(igt_plane_t
>> *plane, igt_pipe_t *pipe,
>>         plane->index,
>>         fb_id);
>>
>> +    if (plane->fence_fd >= 0) {
>> +        uint64_t fence_fd = (int64_t) plane->fence_fd;
>> +        igt_atomic_populate_plane_req(req, plane,
>> IGT_PLANE_IN_FENCE_FD, fence_fd);
>
> Should you reset plane->fence_fd to -1 here? Or tests should
> explicitly clear it for each commit?
>

Resetting it to -1 seems like a good idea to me, if anyone has other 
preferences, just give me a shout.

> Cheers,
> Brian
>> +    }
>> +
>>     if (plane->fb_changed) {
>>         igt_atomic_populate_plane_req(req, plane, IGT_PLANE_CRTC_ID,
>> fb_id ? crtc_id : 0);
>>         igt_atomic_populate_plane_req(req, plane, IGT_PLANE_FB_ID,
>> fb_id);
>> @@ -2522,6 +2529,19 @@ void igt_plane_set_fb(igt_plane_t *plane,
>> struct igt_fb *fb)
>>     plane->size_changed = true;
>> }
>>
>> +/**
>> + * igt_plane_set_fence_fd:
>> + * @plane: plane
>> + * @fence_fd: fence fd, disable fence_fd by setting it to -1
>> + *
>> + * This function sets a fence fd to enable a commit to wait for some
>> event to
>> + * occur before completing.
>> + */
>> +void igt_plane_set_fence_fd(igt_plane_t *plane, uint32_t fence_fd)
>> +{
>> +    plane->fence_fd = fence_fd;
>> +}
>> +
>> void igt_plane_set_position(igt_plane_t *plane, int x, int y)
>> {
>>     igt_pipe_t *pipe = plane->pipe;
>> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
>> index dbe81bcb..9766807c 100644
>> --- a/lib/igt_kms.h
>> +++ b/lib/igt_kms.h
>> @@ -225,6 +225,7 @@ enum igt_atomic_plane_properties {
>>
>>        IGT_PLANE_FB_ID,
>>        IGT_PLANE_CRTC_ID,
>> +       IGT_PLANE_IN_FENCE_FD,
>>        IGT_PLANE_TYPE,
>>        IGT_PLANE_ROTATION,
>>        IGT_NUM_PLANE_PROPS
>> @@ -284,6 +285,9 @@ typedef struct {
>>     uint32_t src_h;
>>
>>     igt_rotation_t rotation;
>> +
>> +    /* in fence fd */
>> +    int32_t fence_fd;
>>     uint32_t atomic_props_plane[IGT_NUM_PLANE_PROPS];
>> } igt_plane_t;
>>
>> @@ -367,6 +371,7 @@ 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);
>>
>> void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb);
>> +void igt_plane_set_fence_fd(igt_plane_t *plane, uint32_t fence_fd);
>> void igt_plane_set_position(igt_plane_t *plane, int x, int y);
>> void igt_plane_set_size(igt_plane_t *plane, int w, int h);
>> void igt_plane_set_rotation(igt_plane_t *plane, igt_rotation_t rotation);
>> --
>> 2.11.0
>>
diff mbox

Patch

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 8aaff5b8..8ca49d86 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -164,6 +164,7 @@  const char *igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = {
 	"CRTC_H",
 	"FB_ID",
 	"CRTC_ID",
+	"IN_FENCE_FD",
 	"type",
 	"rotation"
 };
@@ -1426,6 +1427,7 @@  void igt_display_init(igt_display_t *display, int drm_fd)
 			n_planes++;
 			plane->pipe = pipe;
 			plane->drm_plane = drm_plane;
+			plane->fence_fd = -1;
 
 			if (is_atomic == 0) {
 				display->is_atomic = 1;
@@ -1712,6 +1714,11 @@  igt_atomic_prepare_plane_commit(igt_plane_t *plane, igt_pipe_t *pipe,
 	    plane->index,
 	    fb_id);
 
+	if (plane->fence_fd >= 0) {
+		uint64_t fence_fd = (int64_t) plane->fence_fd;
+		igt_atomic_populate_plane_req(req, plane, IGT_PLANE_IN_FENCE_FD, fence_fd);
+	}
+
 	if (plane->fb_changed) {
 		igt_atomic_populate_plane_req(req, plane, IGT_PLANE_CRTC_ID, fb_id ? crtc_id : 0);
 		igt_atomic_populate_plane_req(req, plane, IGT_PLANE_FB_ID, fb_id);
@@ -2522,6 +2529,19 @@  void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb)
 	plane->size_changed = true;
 }
 
+/**
+ * igt_plane_set_fence_fd:
+ * @plane: plane
+ * @fence_fd: fence fd, disable fence_fd by setting it to -1
+ *
+ * This function sets a fence fd to enable a commit to wait for some event to
+ * occur before completing.
+ */
+void igt_plane_set_fence_fd(igt_plane_t *plane, uint32_t fence_fd)
+{
+	plane->fence_fd = fence_fd;
+}
+
 void igt_plane_set_position(igt_plane_t *plane, int x, int y)
 {
 	igt_pipe_t *pipe = plane->pipe;
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index dbe81bcb..9766807c 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -225,6 +225,7 @@  enum igt_atomic_plane_properties {
 
        IGT_PLANE_FB_ID,
        IGT_PLANE_CRTC_ID,
+       IGT_PLANE_IN_FENCE_FD,
        IGT_PLANE_TYPE,
        IGT_PLANE_ROTATION,
        IGT_NUM_PLANE_PROPS
@@ -284,6 +285,9 @@  typedef struct {
 	uint32_t src_h;
 
 	igt_rotation_t rotation;
+
+	/* in fence fd */
+	int32_t fence_fd;
 	uint32_t atomic_props_plane[IGT_NUM_PLANE_PROPS];
 } igt_plane_t;
 
@@ -367,6 +371,7 @@  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);
 
 void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb);
+void igt_plane_set_fence_fd(igt_plane_t *plane, uint32_t fence_fd);
 void igt_plane_set_position(igt_plane_t *plane, int x, int y);
 void igt_plane_set_size(igt_plane_t *plane, int w, int h);
 void igt_plane_set_rotation(igt_plane_t *plane, igt_rotation_t rotation);