[Intel-gfx] [PATCH 1/3] lib: rename igt_media_fillfunc_t typedef to igt_fillfunc_t

Daniel Vetter daniel at ffwll.ch
Wed Dec 3 06:26:13 PST 2014


On Wed, Dec 03, 2014 at 07:11:17PM +0800, Zhenyu Wang wrote:
> This makes fill function more general to prepare for other
> fill method using GPGPU pipeline.
> 
> Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>

Series lgtm, please push.
-Daniel

> ---
>  lib/intel_batchbuffer.c |  4 ++--
>  lib/intel_batchbuffer.h | 24 ++++++++++++------------
>  tests/gem_media_fill.c  |  2 +-
>  3 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
> index 30ef2cf..4b3a5b8 100644
> --- a/lib/intel_batchbuffer.c
> +++ b/lib/intel_batchbuffer.c
> @@ -496,9 +496,9 @@ igt_render_copyfunc_t igt_get_render_copyfunc(int devid)
>   * The platform-specific media fill function pointer for the device specified
>   * with @devid. Will return NULL when no media fill function is implemented.
>   */
> -igt_media_fillfunc_t igt_get_media_fillfunc(int devid)
> +igt_fillfunc_t igt_get_media_fillfunc(int devid)
>  {
> -	igt_media_fillfunc_t fill = NULL;
> +	igt_fillfunc_t fill = NULL;
>  
>  	if (IS_GEN9(devid))
>  		fill = gen9_media_fillfunc;
> diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h
> index 0ec6601..f0e21ea 100644
> --- a/lib/intel_batchbuffer.h
> +++ b/lib/intel_batchbuffer.h
> @@ -195,7 +195,7 @@ void intel_copy_bo(struct intel_batchbuffer *batch,
>   *
>   * This is a i-g-t buffer object wrapper structure which augments the baseline
>   * libdrm buffer object with suitable data needed by the render copy and the
> - * media fill functions.
> + * fill functions.
>   */
>  struct igt_buf {
>      drm_intel_bo *bo;
> @@ -240,7 +240,7 @@ typedef void (*igt_render_copyfunc_t)(struct intel_batchbuffer *batch,
>  igt_render_copyfunc_t igt_get_render_copyfunc(int devid);
>  
>  /**
> - * igt_media_fillfunc_t:
> + * igt_fillfunc_t:
>   * @batch: batchbuffer object
>   * @dst: destination i-g-t buffer object
>   * @x: destination pixel x-coordination
> @@ -249,19 +249,19 @@ igt_render_copyfunc_t igt_get_render_copyfunc(int devid);
>   * @height: height of the filled rectangle
>   * @color: fill color to use
>   *
> - * This is the type of the per-platform media fill functions. The
> - * platform-specific implementation can be obtained by calling
> - * igt_get_media_fillfunc().
> + * This is the type of the per-platform fill functions using media
> + * pipeline. The platform-specific implementation can be obtained
> + * by calling igt_get_media_fillfunc().
>   *
> - * A media fill function will emit a batchbuffer to the kernel which executes
> + * A fill function will emit a batchbuffer to the kernel which executes
>   * the specified blit fill operation using the media engine.
>   */
> -typedef void (*igt_media_fillfunc_t)(struct intel_batchbuffer *batch,
> -				     struct igt_buf *dst,
> -				     unsigned x, unsigned y,
> -				     unsigned width, unsigned height,
> -				     uint8_t color);
> +typedef void (*igt_fillfunc_t)(struct intel_batchbuffer *batch,
> +			       struct igt_buf *dst,
> +			       unsigned x, unsigned y,
> +			       unsigned width, unsigned height,
> +			       uint8_t color);
>  
> -igt_media_fillfunc_t igt_get_media_fillfunc(int devid);
> +igt_fillfunc_t igt_get_media_fillfunc(int devid);
>  
>  #endif
> diff --git a/tests/gem_media_fill.c b/tests/gem_media_fill.c
> index b06a556..3067317 100644
> --- a/tests/gem_media_fill.c
> +++ b/tests/gem_media_fill.c
> @@ -101,7 +101,7 @@ igt_simple_main
>  	data_t data = {0, };
>  	struct intel_batchbuffer *batch = NULL;
>  	struct igt_buf dst;
> -	igt_media_fillfunc_t media_fill = NULL;
> +	igt_fillfunc_t media_fill = NULL;
>  	int i, j;
>  
>  	data.drm_fd = drm_open_any_render();
> -- 
> 2.1.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch



More information about the Intel-gfx mailing list