diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2021-10-05 15:29:35 -0700 |
|---|---|---|
| committer | Ashutosh Dixit <ashutosh.dixit@intel.com> | 2021-10-08 19:16:05 -0700 |
| commit | 426723f979380f18f9c07d36ebac3a52f760ba7e (patch) | |
| tree | eefda917ee9bb1bf8b7aefd8c607f4a0d8f4eabb /tests/i915/gem_exec_alignment.c | |
| parent | d5d99d16817eca9ce8d191b6e84c1a1fe2ad4428 (diff) | |
lib: Typechecking minmax
Add typechecking to the min/max macros and make their locals truly
unique-ish to reduce the risk of shadowing.
v2: small bug fix, write also height coordinate on rotation
test. (jheikkil)
v3: Fix up a couple of other max/max_t instances (Ashutosh)
Signed-off-by: Juha-Pekka Heikkilä <juha-pekka.heikkila@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Chris Wilson <chris.p.wilson@intel.com>
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Diffstat (limited to 'tests/i915/gem_exec_alignment.c')
| -rw-r--r-- | tests/i915/gem_exec_alignment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/i915/gem_exec_alignment.c b/tests/i915/gem_exec_alignment.c index c4611bd1..68b95c86 100644 --- a/tests/i915/gem_exec_alignment.c +++ b/tests/i915/gem_exec_alignment.c @@ -166,7 +166,7 @@ naughty_child(int i915, int link, uint32_t shared, unsigned int flags) if (!gem_uses_full_ppgtt(i915)) gtt_size /= 2; /* We have to *share* our GTT! */ - ram_size = min(intel_get_total_ram_mb(), 4096); + ram_size = min_t(uint64_t, intel_get_total_ram_mb(), 4096); ram_size *= 1024 * 1024; count = min(gtt_size, ram_size) / 16384; @@ -376,7 +376,7 @@ setup_many(int i915, unsigned long *out) if (!gem_uses_full_ppgtt(i915)) gtt_size /= 2; /* We have to *share* our GTT! */ - ram_size = min(intel_get_total_ram_mb(), 4096); + ram_size = min_t(uint64_t, intel_get_total_ram_mb(), 4096); ram_size *= 1024 * 1024; count = min(gtt_size, ram_size) / 16384; |