summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2023-01-02 18:48:37 +0200
committerEric Engestrom <eric@engestrom.ch>2023-03-08 18:00:15 +0000
commitb8a0400d6a2e8b771af149f45061fd09f8af2ab8 (patch)
treeb4d34f797ae072db72899e45a9e7c32e39a35cde
parenta9c1e40120934fe45622bbf9b25465076019226a (diff)
downloadmesa-b8a0400d6a2e8b771af149f45061fd09f8af2ab8.tar.gz
anv: remove pre hasvk split assert
With softpin we should not always expect a BO in addresses. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Cc: mesa-stable Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Ivan Briano <ivan.briano@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20497> (cherry picked from commit f5dc88910f4345260ca3b491d66c3fc0cd0fb452)
-rw-r--r--.pick_status.json2
-rw-r--r--src/intel/vulkan/anv_private.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index faa4396b4af..eaa3dfe7ce8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2731,7 +2731,7 @@
"description": "anv: remove pre hasvk split assert",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 87ea3058bfd..b8204b539aa 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -2475,7 +2475,6 @@ anv_gfx8_9_vb_cache_range_needs_workaround(struct anv_vb_cache_range *bound,
return false;
}
- assert(vb_address.bo);
bound->start = intel_48b_address(anv_address_physical(vb_address));
bound->end = bound->start + vb_size;
assert(bound->end > bound->start); /* No overflow */