[igt-dev] [PATCH i-g-t] tests/kms_cursor_crc Stripping rendercopy implementation to use cairo

[Juha-Pekka Heikkila]

On 3.9.2020 11.11, Kamati Srinivas wrote:
> Rendercopy implementation is stripped to use cairo for restoring image.
> With cario, no more crc errors are observed and dead code is removed.
        ^^
cairo

There's colon (:) missing from subject.

otherwise changes look ok, this test doesn't need to use rendercopy.

I'll add missing colon to subject and fix that one typo and push to igt 
bit later.

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>

> 
> Cc: Heikkila, Juha-pekka <juha-pekka.heikkila at intel.com>
> Signed-off-by: Kamati Srinivas <srinivasx.k at intel.com>
> ---
>   tests/kms_cursor_crc.c | 91 ++++++------------------------------------
>   1 file changed, 13 insertions(+), 78 deletions(-)
> 
> diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
> index e9491847..0be8f7f8 100644
> --- a/tests/kms_cursor_crc.c
> +++ b/tests/kms_cursor_crc.c
> @@ -64,11 +64,6 @@ typedef struct {
>   	igt_plane_t *cursor;
>   	cairo_surface_t *surface;
>   	uint32_t devid;
> -	drm_intel_bufmgr *bufmgr;
> -	igt_render_copyfunc_t rendercopy;
> -	drm_intel_bo * drmibo[2];
> -	struct intel_batchbuffer *batch;
> -	struct igt_buf igtbo[2];
>   
>   } data_t;
>   
> @@ -153,23 +148,14 @@ static void restore_image(data_t *data)
>   {
>   	cairo_t *cr;
>   
> -	if (data->rendercopy != NULL) {
> -		/* use rendercopy if available */
> -		data->rendercopy(data->batch, NULL,
> -				 &data->igtbo[RESTOREBUFFER], 0, 0,
> -				 data->primary_fb[RESTOREBUFFER].width,
> -				 data->primary_fb[RESTOREBUFFER].height,
> -				 &data->igtbo[FRONTBUFFER], 0, 0);
> -	} else {
> -		/* if rendercopy not implemented in igt use cairo */
> -		cr = igt_get_cairo_ctx(data->drm_fd,
> -				       &data->primary_fb[FRONTBUFFER]);
> -		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
> -		cairo_set_source_surface(cr, data->surface, 0, 0);
> -		cairo_rectangle(cr, 0, 0, data->screenw, data->screenh);
> -		cairo_fill(cr);
> -		igt_put_cairo_ctx(cr);
> -	}
> +	/* rendercopy stripped in igt using cairo */
> +	cr = igt_get_cairo_ctx(data->drm_fd,
> +			       &data->primary_fb[FRONTBUFFER]);
> +	cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
> +	cairo_set_source_surface(cr, data->surface, 0, 0);
> +	cairo_rectangle(cr, 0, 0, data->screenw, data->screenh);
> +	cairo_fill(cr);
> +	igt_put_cairo_ctx(cr);
>   	igt_dirty_fb(data->drm_fd, &data->primary_fb[FRONTBUFFER]);
>   }
>   
> @@ -384,15 +370,6 @@ static void cleanup_crtc(data_t *data)
>   	igt_display_reset(display);
>   }
>   
> -static void scratch_buf_init(data_t *data, int buffer)
> -{
> -	data->igtbo[buffer].bo = data->drmibo[buffer];
> -	data->igtbo[buffer].surface[0].stride = data->primary_fb[buffer].strides[0];
> -	data->igtbo[buffer].tiling = data->primary_fb[buffer].modifier;
> -	data->igtbo[buffer].surface[0].size = data->primary_fb[buffer].size;
> -	data->igtbo[buffer].bpp = data->primary_fb[buffer].plane_bpp[0];
> -}
> -
>   static void prepare_crtc(data_t *data, igt_output_t *output,
>   			 int cursor_w, int cursor_h)
>   {
> @@ -443,38 +420,11 @@ static void prepare_crtc(data_t *data, igt_output_t *output,
>   
>   	data->surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, data->screenw, data->screenh);
>   
> -	if (data->rendercopy == NULL) {
> -		/* store test image as cairo surface */
> -		cr = cairo_create(data->surface);
> -		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
> -		igt_paint_test_pattern(cr, data->screenw, data->screenh);
> -		cairo_destroy(cr);
> -	} else {
> -		/* store test image as fb if rendercopy is available */
> -		cr = igt_get_cairo_ctx(data->drm_fd,
> -		                       &data->primary_fb[RESTOREBUFFER]);
> -		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
> -		igt_paint_test_pattern(cr, data->screenw, data->screenh);
> -		igt_put_cairo_ctx(cr);
> -
> -		data->drmibo[FRONTBUFFER] = gem_handle_to_libdrm_bo(data->bufmgr,
> -								    data->drm_fd,
> -								    "", data->primary_fb[FRONTBUFFER].gem_handle);
> -		igt_assert(data->drmibo[FRONTBUFFER]);
> -
> -		data->drmibo[RESTOREBUFFER] = gem_handle_to_libdrm_bo(data->bufmgr,
> -								      data->drm_fd,
> -								      "", data->primary_fb[RESTOREBUFFER].gem_handle);
> -		igt_assert(data->drmibo[RESTOREBUFFER]);
> -
> -		scratch_buf_init(data, RESTOREBUFFER);
> -		scratch_buf_init(data, FRONTBUFFER);
> -
> -		data->batch = intel_batchbuffer_alloc(data->bufmgr,
> -						      data->devid);
> -		igt_assert(data->batch);
> -	}
> -
> +	/* store test image as cairo surface */
> +	cr = cairo_create(data->surface);
> +	cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
> +	igt_paint_test_pattern(cr, data->screenw, data->screenh);
> +	cairo_destroy(cr);
>   	igt_pipe_crc_start(data->pipe_crc);
>   }
>   
> @@ -830,16 +780,6 @@ igt_main
>   		igt_require_pipe_crc(data.drm_fd);
>   
>   		igt_display_require(&data.display, data.drm_fd);
> -
> -		if (is_i915_device(data.drm_fd)) {
> -			data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
> -			igt_assert(data.bufmgr);
> -			drm_intel_bufmgr_gem_enable_reuse(data.bufmgr);
> -
> -			data.devid = intel_get_drm_devid(data.drm_fd);
> -			data.rendercopy = igt_get_render_copyfunc(data.devid);
> -		}
> -		igt_debug("Using %s for restoring test image\n", (data.rendercopy == NULL)?"Cairo":"rendercopy");
>   	}
>   
>   	data.cursor_max_w = cursor_width;
> @@ -855,11 +795,6 @@ igt_main
>   			igt_pipe_crc_free(data.pipe_crc);
>   		}
>   
> -		if (data.bufmgr != NULL) {
> -			intel_batchbuffer_free(data.batch);
> -			drm_intel_bufmgr_destroy(data.bufmgr);
> -		}
> -
>   		igt_display_fini(&data.display);
>   	}
>   }
>