v3d/simulator: get rid of has_gca wrapper

We can assume that it is always present on 3.3 and below. In fact,
recent updates of the simulator will remove it, so this change would
be needed soon.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11040>

diff --git a/src/broadcom/simulator/v3d_simulator_wrapper.cpp b/src/broadcom/simulator/v3d_simulator_wrapper.cpp
index 7a6fb98..88e4392 100644 (file)
--- a/src/broadcom/simulator/v3d_simulator_wrapper.cpp
+++ b/src/broadcom/simulator/v3d_simulator_wrapper.cpp
@@ -56,11 +56,6 @@ bool v3d_hw_alloc_mem(struct v3d_hw *hw, size_t min_size)
         return hw->alloc_mem(min_size) == V3D_HW_ALLOC_SUCCESS;
 }
 
-bool v3d_hw_has_gca(struct v3d_hw *hw)
-{
-        return hw->has_gca();
-}
-
 uint32_t v3d_hw_read_reg(struct v3d_hw *hw, uint32_t reg)
 {
         return hw->read_reg(reg);

diff --git a/src/broadcom/simulator/v3d_simulator_wrapper.h b/src/broadcom/simulator/v3d_simulator_wrapper.h
index 90e7c42..05b2a33 100644 (file)
--- a/src/broadcom/simulator/v3d_simulator_wrapper.h
+++ b/src/broadcom/simulator/v3d_simulator_wrapper.h
@@ -33,7 +33,6 @@ extern "C" {
 struct v3d_hw *v3d_hw_auto_new(void *params);
 uint32_t v3d_hw_get_mem(const struct v3d_hw *hw, uint32_t *size, void **p);
 bool v3d_hw_alloc_mem(struct v3d_hw *hw, size_t min_size);
-bool v3d_hw_has_gca(struct v3d_hw *hw);
 uint32_t v3d_hw_read_reg(struct v3d_hw *hw, uint32_t reg);
 void v3d_hw_write_reg(struct v3d_hw *hw, uint32_t reg, uint32_t val);
 void v3d_hw_tick(struct v3d_hw *hw);

diff --git a/src/broadcom/simulator/v3dx_simulator.c b/src/broadcom/simulator/v3dx_simulator.c
index 662624e..f00f1b0 100644 (file)
--- a/src/broadcom/simulator/v3dx_simulator.c
+++ b/src/broadcom/simulator/v3dx_simulator.c
@@ -58,9 +58,6 @@
 static void
 v3d_invalidate_l3(struct v3d_hw *v3d)
 {
-        if (!v3d_hw_has_gca(v3d))
-                return;
-
 #if V3D_VERSION < 40
         uint32_t gca_ctrl = V3D_READ(V3D_GCA_CACHE_CTRL);