Mesa (master): intel/isl: Use uint64_t to store total surface size

[Anuj Phogat]

Module: Mesa
Branch: master
Commit: 70229782370c7ed9a63e05689f4d8bfc80128dd9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=70229782370c7ed9a63e05689f4d8bfc80128dd9

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Fri May 19 13:47:12 2017 -0700

intel/isl: Use uint64_t to store total surface size

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>

---

 src/intel/isl/isl.c | 3 ++-
 src/intel/isl/isl.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 860fc28b27..cf9aa4a4c1 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -1467,7 +1467,8 @@ isl_surf_init_s(const struct isl_device *dev,
                            &phys_total_el, &row_pitch))
       return false;
 
-   uint32_t size, base_alignment;
+   uint32_t base_alignment;
+   uint64_t size;
    if (tiling == ISL_TILING_LINEAR) {
       size = row_pitch * padded_h_el + pad_bytes;
 
diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index 95ecaf90d8..07ff01a427 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -1106,7 +1106,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;