aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <[email protected]>2019-12-27 12:16:09 -0500
committerAlyssa Rosenzweig <[email protected]>2019-12-27 12:16:09 -0500
commit4ccd42e0bc488c53a17343013c5565410ff0b424 (patch)
treee46d731365b1755edc8d41fc836d80effb6287df
parent76519b216be9180a19f43c531eccf05a9bf38bec (diff)
panfrost: Inline away MALI_NEGATIVE
It's an awfully fancy way to add one... Signed-off-by: Alyssa Rosenzweig <[email protected]>
-rw-r--r--src/panfrost/include/panfrost-job.h4
-rw-r--r--src/panfrost/pandecode/decode.c10
2 files changed, 5 insertions, 9 deletions
diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index 157f05ced09..8af66a8a306 100644
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -1151,10 +1151,6 @@ struct bifrost_payload_fused {
#define MALI_POSITIVE(dim) (dim - 1)
-/* Opposite of MALI_POSITIVE, found in the depth_units field */
-
-#define MALI_NEGATIVE(dim) (dim + 1)
-
/* Used with wrapping. Incomplete (this is a 4-bit field...) */
enum mali_wrap_mode {
diff --git a/src/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c
index 6be8c1b73b1..d88158a9312 100644
--- a/src/panfrost/pandecode/decode.c
+++ b/src/panfrost/pandecode/decode.c
@@ -661,7 +661,7 @@ pandecode_sfbd_format(struct mali_sfbd_format format)
pandecode_log_cont(",\n");
pandecode_prop("nr_channels = MALI_POSITIVE(%d)",
- MALI_NEGATIVE(format.nr_channels));
+ (format.nr_channels + 1));
pandecode_log(".unk2 = ");
pandecode_log_decoded_flags(sfbd_unk2_info, format.unk2);
@@ -958,7 +958,7 @@ pandecode_rt_format(struct mali_rt_format format)
pandecode_log_cont(",\n");
pandecode_prop("nr_channels = MALI_POSITIVE(%d)",
- MALI_NEGATIVE(format.nr_channels));
+ (format.nr_channels + 1));
pandecode_log(".flags = ");
pandecode_log_decoded_flags(mfbd_fmt_flag_info, format.flags);
@@ -988,7 +988,7 @@ pandecode_render_target(uint64_t gpu_va, unsigned job_no, const struct bifrost_f
pandecode_log("struct bifrost_render_target rts_list_%"PRIx64"_%d[] = {\n", gpu_va, job_no);
pandecode_indent++;
- for (int i = 0; i < MALI_NEGATIVE(fb->rt_count_1); i++) {
+ for (int i = 0; i < (fb->rt_count_1 + 1); i++) {
mali_ptr rt_va = gpu_va + i * sizeof(struct bifrost_render_target);
struct pandecode_mapped_memory *mem =
pandecode_find_mapped_gpu_mem_containing(rt_va);
@@ -2035,14 +2035,14 @@ pandecode_texture(mali_ptr u,
* properties, but dump extra
* possibilities to futureproof */
- int bitmap_count = MALI_NEGATIVE(t->levels);
+ int bitmap_count = t->levels + 1;
/* Miptree for each face */
if (f.type == MALI_TEX_CUBE)
bitmap_count *= 6;
/* Array of textures */
- bitmap_count *= MALI_NEGATIVE(t->array_size);
+ bitmap_count *= (t->array_size + 1);
/* Stride for each element */
if (f.manual_stride)