From: Katarzyna Dec <katarzyna.dec@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v7 4/4] lib: Adjust refactored gpu_fill library to our coding style
Date: Wed, 11 Apr 2018 10:15:01 +0200 [thread overview]
Message-ID: <20180411081501.5375-5-katarzyna.dec@intel.com> (raw)
In-Reply-To: <20180411081501.5375-1-katarzyna.dec@intel.com>
While I am making changes in gpgpu and media fill area let's
adjust code to our coding style.
v2: rebased on series new version (patch is now last from
series so change seems larger)
v3: rebased
Signed-off-by: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
lib/gpgpu_fill.c | 24 ++++++++++++------------
lib/gpgpu_fill.h | 12 ++++++------
lib/media_fill.h | 20 ++++++++++----------
lib/media_fill_gen7.c | 7 +++----
lib/media_fill_gen8.c | 7 ++++---
lib/media_fill_gen9.c | 7 ++++---
6 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/lib/gpgpu_fill.c b/lib/gpgpu_fill.c
index 5a77ebd4..72a1445a 100644
--- a/lib/gpgpu_fill.c
+++ b/lib/gpgpu_fill.c
@@ -99,8 +99,8 @@ static const uint32_t gen9_gpgpu_kernel[][4] = {
void
gen7_gpgpu_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color)
{
uint32_t curbe_buffer, interface_descriptor;
@@ -120,8 +120,8 @@ gen7_gpgpu_fillfunc(struct intel_batchbuffer *batch,
curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
interface_descriptor = gen7_fill_interface_descriptor(batch, dst,
- gen7_gpgpu_kernel,
- sizeof(gen7_gpgpu_kernel));
+ gen7_gpgpu_kernel, sizeof(gen7_gpgpu_kernel));
+
igt_assert(batch->ptr < &batch->buffer[4095]);
batch->ptr = batch->buffer;
@@ -147,8 +147,8 @@ gen7_gpgpu_fillfunc(struct intel_batchbuffer *batch,
void
gen8_gpgpu_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color)
{
uint32_t curbe_buffer, interface_descriptor;
@@ -168,8 +168,8 @@ gen8_gpgpu_fillfunc(struct intel_batchbuffer *batch,
curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
- gen8_gpgpu_kernel,
- sizeof(gen8_gpgpu_kernel));
+ gen8_gpgpu_kernel, sizeof(gen8_gpgpu_kernel));
+
igt_assert(batch->ptr < &batch->buffer[4095]);
batch->ptr = batch->buffer;
@@ -195,8 +195,8 @@ gen8_gpgpu_fillfunc(struct intel_batchbuffer *batch,
void
gen9_gpgpu_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color)
{
uint32_t curbe_buffer, interface_descriptor;
@@ -216,8 +216,8 @@ gen9_gpgpu_fillfunc(struct intel_batchbuffer *batch,
curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
- gen9_gpgpu_kernel,
- sizeof(gen9_gpgpu_kernel));
+ gen9_gpgpu_kernel, sizeof(gen9_gpgpu_kernel));
+
igt_assert(batch->ptr < &batch->buffer[4095]);
batch->ptr = batch->buffer;
diff --git a/lib/gpgpu_fill.h b/lib/gpgpu_fill.h
index 7b5c8322..f0d188ae 100644
--- a/lib/gpgpu_fill.h
+++ b/lib/gpgpu_fill.h
@@ -30,22 +30,22 @@
void
gen7_gpgpu_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color);
void
gen8_gpgpu_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color);
void
gen9_gpgpu_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color);
#endif /* GPGPU_FILL_H */
diff --git a/lib/media_fill.h b/lib/media_fill.h
index 161af8cf..f6db734e 100644
--- a/lib/media_fill.h
+++ b/lib/media_fill.h
@@ -7,22 +7,22 @@
void
gen8_media_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color);
void
gen7_media_fillfunc(struct intel_batchbuffer *batch,
- struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
- uint8_t color);
+ struct igt_buf *dst,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
+ uint8_t color);
void
gen9_media_fillfunc(struct intel_batchbuffer *batch,
- struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
- uint8_t color);
+ struct igt_buf *dst,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
+ uint8_t color);
#endif /* RENDE_MEDIA_FILL_H */
diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c
index c97555a6..5a8c32fb 100644
--- a/lib/media_fill_gen7.c
+++ b/lib/media_fill_gen7.c
@@ -47,8 +47,8 @@ static const uint32_t media_kernel[][4] = {
void
gen7_media_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color)
{
uint32_t curbe_buffer, interface_descriptor;
@@ -61,8 +61,7 @@ gen7_media_fillfunc(struct intel_batchbuffer *batch,
curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
interface_descriptor = gen7_fill_interface_descriptor(batch, dst,
- media_kernel,
- sizeof(media_kernel));
+ media_kernel, sizeof(media_kernel));
igt_assert(batch->ptr < &batch->buffer[4095]);
/* media pipeline */
diff --git a/lib/media_fill_gen8.c b/lib/media_fill_gen8.c
index 362abd61..d6dd7410 100644
--- a/lib/media_fill_gen8.c
+++ b/lib/media_fill_gen8.c
@@ -50,8 +50,8 @@ static const uint32_t media_kernel[][4] = {
void
gen8_media_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color)
{
uint32_t curbe_buffer, interface_descriptor;
@@ -63,7 +63,8 @@ gen8_media_fillfunc(struct intel_batchbuffer *batch,
batch->ptr = &batch->buffer[BATCH_STATE_SPLIT];
curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
- interface_descriptor = gen8_fill_interface_descriptor(batch, dst, media_kernel, sizeof(media_kernel));
+ interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
+ media_kernel, sizeof(media_kernel));
igt_assert(batch->ptr < &batch->buffer[4095]);
/* media pipeline */
diff --git a/lib/media_fill_gen9.c b/lib/media_fill_gen9.c
index d1335fe6..a9a829f2 100644
--- a/lib/media_fill_gen9.c
+++ b/lib/media_fill_gen9.c
@@ -47,8 +47,8 @@ static const uint32_t media_kernel[][4] = {
void
gen9_media_fillfunc(struct intel_batchbuffer *batch,
struct igt_buf *dst,
- unsigned x, unsigned y,
- unsigned width, unsigned height,
+ unsigned int x, unsigned int y,
+ unsigned int width, unsigned int height,
uint8_t color)
{
uint32_t curbe_buffer, interface_descriptor;
@@ -60,7 +60,8 @@ gen9_media_fillfunc(struct intel_batchbuffer *batch,
batch->ptr = &batch->buffer[BATCH_STATE_SPLIT];
curbe_buffer = gen7_fill_curbe_buffer_data(batch, color);
- interface_descriptor = gen8_fill_interface_descriptor(batch, dst, media_kernel, sizeof(media_kernel));
+ interface_descriptor = gen8_fill_interface_descriptor(batch, dst,
+ media_kernel, sizeof(media_kernel));
assert(batch->ptr < &batch->buffer[4095]);
/* media pipeline */
--
2.14.3
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2018-04-11 8:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-11 8:14 [igt-dev] [PATCH i-g-t v7 0/4] Refactoring of *_fill libraries Katarzyna Dec
2018-04-11 8:14 ` [igt-dev] [PATCH i-g-t v7 1/4] lib: Move common gpgpu/media fill functions to gpu_fill library Katarzyna Dec
2018-04-11 8:14 ` [igt-dev] [PATCH i-g-t v7 2/4] lib: Remove duplications in " Katarzyna Dec
2018-04-11 11:53 ` Szwichtenberg, Radoslaw
2018-04-11 13:42 ` Katarzyna Dec
2018-04-11 8:15 ` [igt-dev] [PATCH i-g-t v7 3/4] lib/gpgpu_fill: Add missing configuration parameters for gpgpu_fill Katarzyna Dec
2018-04-11 8:15 ` Katarzyna Dec [this message]
2018-04-11 8:49 ` [igt-dev] ✓ Fi.CI.BAT: success for Refactoring of *_fill libraries (rev4) Patchwork
2018-04-11 9:32 ` [igt-dev] ✗ Fi.CI.IGT: warning " Patchwork
2018-04-11 12:10 ` [igt-dev] [PATCH i-g-t v7 0/4] Refactoring of *_fill libraries Szwichtenberg, Radoslaw
2018-04-12 21:26 ` Arkadiusz Hiler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180411081501.5375-5-katarzyna.dec@intel.com \
--to=katarzyna.dec@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox