diff mbox

[i-g-t] tests/chamelium: Adapt to dynamic number of planes changes

Message ID 1485946594-4563-1-git-send-email-petri.latvala@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Petri Latvala Feb. 1, 2017, 10:56 a.m. UTC 
CC: Robert Foss <robert.foss@collabora.com>
CC: Lyude <lyude@redhat.com>
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
---
 tests/chamelium.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Robert Foss Feb. 1, 2017, 1:24 p.m. UTC | #1 
This looks good to me, feel free to add my r-b.

Rob.

On 2017-02-01 05:56 AM, Petri Latvala wrote:
> CC: Robert Foss <robert.foss@collabora.com>
> CC: Lyude <lyude@redhat.com>
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> ---
>  tests/chamelium.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/chamelium.c b/tests/chamelium.c
> index d914d5b..e03acc4 100644
> --- a/tests/chamelium.c
> +++ b/tests/chamelium.c
> @@ -310,7 +310,7 @@ enable_output(data_t *data,
>  	      struct igt_fb *fb)
>  {
>  	igt_display_t *display = output->display;
> -	igt_plane_t *primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	igt_plane_t *primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>  	drmModeConnector *connector = chamelium_port_get_connector(
>  	    data->chamelium, port, false);
>
> @@ -341,7 +341,7 @@ disable_output(data_t *data,
>  	       igt_output_t *output)
>  {
>  	igt_display_t *display = output->display;
> -	igt_plane_t *primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	igt_plane_t *primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>
>  	/* Disable the display */
> @@ -364,7 +364,7 @@ test_display_crc_single(data_t *data, struct chamelium_port *port)
>
>  	output = prepare_output(data, &display, port);
>  	connector = chamelium_port_get_connector(data->chamelium, port, false);
> -	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>
>  	for (i = 0; i < connector->count_modes; i++) {
> @@ -418,7 +418,7 @@ test_display_crc_multiple(data_t *data, struct chamelium_port *port)
>
>  	output = prepare_output(data, &display, port);
>  	connector = chamelium_port_get_connector(data->chamelium, port, false);
> -	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>
>  	for (i = 0; i < connector->count_modes; i++) {
> @@ -477,7 +477,7 @@ test_display_frame_dump(data_t *data, struct chamelium_port *port)
>
>  	output = prepare_output(data, &display, port);
>  	connector = chamelium_port_get_connector(data->chamelium, port, false);
> -	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>
>  	for (i = 0; i < connector->count_modes; i++) {
>
Lyude Paul Feb. 1, 2017, 6:12 p.m. UTC | #2 
Reviewed-by: Lyude <lyude@redhat.com>

If you need someone to push this let me know

On Wed, 2017-02-01 at 12:56 +0200, Petri Latvala wrote:
> CC: Robert Foss <robert.foss@collabora.com>
> CC: Lyude <lyude@redhat.com>
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> ---
>  tests/chamelium.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/chamelium.c b/tests/chamelium.c
> index d914d5b..e03acc4 100644
> --- a/tests/chamelium.c
> +++ b/tests/chamelium.c
> @@ -310,7 +310,7 @@ enable_output(data_t *data,
>  	      struct igt_fb *fb)
>  {
>  	igt_display_t *display = output->display;
> -	igt_plane_t *primary = igt_output_get_plane(output,
> IGT_PLANE_PRIMARY);
> +	igt_plane_t *primary = igt_output_get_plane_type(output,
> DRM_PLANE_TYPE_PRIMARY);
>  	drmModeConnector *connector = chamelium_port_get_connector(
>  	    data->chamelium, port, false);
>  
> @@ -341,7 +341,7 @@ disable_output(data_t *data,
>  	       igt_output_t *output)
>  {
>  	igt_display_t *display = output->display;
> -	igt_plane_t *primary = igt_output_get_plane(output,
> IGT_PLANE_PRIMARY);
> +	igt_plane_t *primary = igt_output_get_plane_type(output,
> DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>  
>  	/* Disable the display */
> @@ -364,7 +364,7 @@ test_display_crc_single(data_t *data, struct
> chamelium_port *port)
>  
>  	output = prepare_output(data, &display, port);
>  	connector = chamelium_port_get_connector(data->chamelium,
> port, false);
> -	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	primary = igt_output_get_plane_type(output,
> DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>  
>  	for (i = 0; i < connector->count_modes; i++) {
> @@ -418,7 +418,7 @@ test_display_crc_multiple(data_t *data, struct
> chamelium_port *port)
>  
>  	output = prepare_output(data, &display, port);
>  	connector = chamelium_port_get_connector(data->chamelium,
> port, false);
> -	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	primary = igt_output_get_plane_type(output,
> DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>  
>  	for (i = 0; i < connector->count_modes; i++) {
> @@ -477,7 +477,7 @@ test_display_frame_dump(data_t *data, struct
> chamelium_port *port)
>  
>  	output = prepare_output(data, &display, port);
>  	connector = chamelium_port_get_connector(data->chamelium,
> port, false);
> -	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
> +	primary = igt_output_get_plane_type(output,
> DRM_PLANE_TYPE_PRIMARY);
>  	igt_assert(primary);
>  
>  	for (i = 0; i < connector->count_modes; i++) {
diff mbox

Patch

diff --git a/tests/chamelium.c b/tests/chamelium.c
index d914d5b..e03acc4 100644
--- a/tests/chamelium.c
+++ b/tests/chamelium.c
@@ -310,7 +310,7 @@  enable_output(data_t *data,
 	      struct igt_fb *fb)
 {
 	igt_display_t *display = output->display;
-	igt_plane_t *primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
+	igt_plane_t *primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	drmModeConnector *connector = chamelium_port_get_connector(
 	    data->chamelium, port, false);
 
@@ -341,7 +341,7 @@  disable_output(data_t *data,
 	       igt_output_t *output)
 {
 	igt_display_t *display = output->display;
-	igt_plane_t *primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
+	igt_plane_t *primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	igt_assert(primary);
 
 	/* Disable the display */
@@ -364,7 +364,7 @@  test_display_crc_single(data_t *data, struct chamelium_port *port)
 
 	output = prepare_output(data, &display, port);
 	connector = chamelium_port_get_connector(data->chamelium, port, false);
-	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
+	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	igt_assert(primary);
 
 	for (i = 0; i < connector->count_modes; i++) {
@@ -418,7 +418,7 @@  test_display_crc_multiple(data_t *data, struct chamelium_port *port)
 
 	output = prepare_output(data, &display, port);
 	connector = chamelium_port_get_connector(data->chamelium, port, false);
-	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
+	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	igt_assert(primary);
 
 	for (i = 0; i < connector->count_modes; i++) {
@@ -477,7 +477,7 @@  test_display_frame_dump(data_t *data, struct chamelium_port *port)
 
 	output = prepare_output(data, &display, port);
 	connector = chamelium_port_get_connector(data->chamelium, port, false);
-	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
+	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	igt_assert(primary);
 
 	for (i = 0; i < connector->count_modes; i++) {