summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnuj Phogat <anuj.phogat@gmail.com>2017-05-19 13:47:12 -0700
committerAndres Gomez <agomez@igalia.com>2017-07-12 19:32:09 +0300
commit7fc94625cca0d9f5997252b0598bc4e0e6b9597a (patch)
tree058aedce6bc84d966145c58620436eec10508e22
parent9e0ef936918f3a6b940f0a1509c1b7dd09bdc3d9 (diff)
intel/isl: Use uint64_t to store total surface size
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Nanley Chery <nanley.g.chery@intel.com> (cherry picked from commit 70229782370c7ed9a63e05689f4d8bfc80128dd9)
-rw-r--r--src/intel/isl/isl.c3
-rw-r--r--src/intel/isl/isl.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index f89f351c157..32aa698eb87 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1362,7 +1362,8 @@ isl_surf_init_s(const struct isl_device *dev,
&phys_slice0_sa, &row_pitch))
return false;
- uint32_t size, base_alignment;
+ uint32_t base_alignment;
+ uint64_t size;
if (tiling == ISL_TILING_LINEAR) {
size = row_pitch * total_h_el + pad_bytes;
diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index 7778551579d..c9970bc2c54 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -868,7 +868,7 @@ struct isl_surf {
uint32_t samples;
/** Total size of the surface, in bytes. */
- uint32_t size;
+ uint64_t size;
/** Required alignment for the surface's base address. */
uint32_t alignment;