From patchwork Wed Dec 3 11:11:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 5426491 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0907D9F319 for ; Wed, 3 Dec 2014 03:11:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F0FB42035C for ; Wed, 3 Dec 2014 03:11:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CBDC72034F for ; Wed, 3 Dec 2014 03:11:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED88572645; Tue, 2 Dec 2014 19:11:50 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id CFA7972644 for ; Tue, 2 Dec 2014 19:11:49 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 02 Dec 2014 19:11:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,505,1413270000"; d="scan'208";a="647299159" Received: from debian-hsw.sh.intel.com ([10.239.36.27]) by orsmga002.jf.intel.com with ESMTP; 02 Dec 2014 19:11:48 -0800 From: Zhenyu Wang To: intel-gfx@lists.freedesktop.org Date: Wed, 3 Dec 2014 19:11:17 +0800 Message-Id: <1417605079-10913-1-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 2.1.3 Subject: [Intel-gfx] [PATCH 1/3] lib: rename igt_media_fillfunc_t typedef to igt_fillfunc_t X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This makes fill function more general to prepare for other fill method using GPGPU pipeline. Signed-off-by: Zhenyu Wang --- 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();