From b02d136b5e14f94e5f3ab8489f0fbfaa88e76820 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 13 Jul 2017 16:08:34 +0100 Subject: [PATCH] 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 Reviewed-by: Anuj Phogat --- 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 575f04f8648..e7ebc29b59d 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. */ -- 2.30.2