Mesa (master): i965: map_gtt: check mapping address before adding offset

[Lionel Landwerlin]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Jul 13 16:08:34 2017 +0100

i965: map_gtt: check mapping address before adding offset

The NULL check might fail if offset isn't 0.

CID: 971379
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

 src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 575f04f864..e7ebc29b59 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -2965,11 +2965,13 @@ intel_miptree_map_gtt(struct brw_context *brw,
    y /= bh;
    x /= bw;
 
-   base = intel_miptree_map_raw(brw, mt, map->mode) + mt->offset;
+   base = intel_miptree_map_raw(brw, mt, map->mode);
 
    if (base == NULL)
       map->ptr = NULL;
    else {
+      base += mt->offset;
+
       /* Note that in the case of cube maps, the caller must have passed the
        * slice number referencing the face.
       */