[Intel-gfx] [PATCH 5/7] drm/i915/gt: Refactor _wa_add to reuse wa_index and wa_list_grow

[Umesh Nerlige Ramappa]

Switch the search and grow code of the _wa_add to use _wa_index and
_wa_list_grow.

Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.rama...@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 54 +++++++--------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c 
b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 722f11e43dad..b79a08868fa7 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -190,53 +190,33 @@ static void _wa_remove(struct i915_wa_list *wal, 
i915_reg_t reg, u32 flags)
 
 static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
 {
-       unsigned int addr = i915_mmio_reg_offset(wa->reg);
-       unsigned int start = 0, end = wal->count;
+       int index;
        const unsigned int grow = WA_LIST_CHUNK;
        struct i915_wa *wa_;
 
        GEM_BUG_ON(!is_power_of_2(grow));
 
-       if (IS_ALIGNED(wal->count, grow)) { /* Either uninitialized or full. */
-               struct i915_wa *list;
-
-               list = kmalloc_array(ALIGN(wal->count + 1, grow), sizeof(*wa),
-                                    GFP_KERNEL);
-               if (!list) {
-                       DRM_ERROR("No space for workaround init!\n");
+       if (IS_ALIGNED(wal->count, grow)) /* Either uninitialized or full. */
+               if (_wa_list_grow(wal, wal->count) < 0)
                        return;
-               }
-
-               if (wal->list)
-                       memcpy(list, wal->list, sizeof(*wa) * wal->count);
 
-               wal->list = list;
-       }
+       index = _wa_index(wal, wa->reg);
+       if (index >= 0) {
+               wa_ = &wal->list[index];
 
-       while (start < end) {
-               unsigned int mid = start + (end - start) / 2;
+               if ((wa->clr | wa_->clr) && !(wa->clr & ~wa_->clr)) {
+                       DRM_ERROR("Discarding overwritten w/a for reg %04x 
(clear: %08x, set: %08x)\n",
+                                 i915_mmio_reg_offset(wa_->reg),
+                                 wa_->clr, wa_->set);
 
-               if (i915_mmio_reg_offset(wal->list[mid].reg) < addr) {
-                       start = mid + 1;
-               } else if (i915_mmio_reg_offset(wal->list[mid].reg) > addr) {
-                       end = mid;
-               } else {
-                       wa_ = &wal->list[mid];
-
-                       if ((wa->clr | wa_->clr) && !(wa->clr & ~wa_->clr)) {
-                               DRM_ERROR("Discarding overwritten w/a for reg 
%04x (clear: %08x, set: %08x)\n",
-                                         i915_mmio_reg_offset(wa_->reg),
-                                         wa_->clr, wa_->set);
-
-                               wa_->set &= ~wa->clr;
-                       }
-
-                       wal->wa_count++;
-                       wa_->set |= wa->set;
-                       wa_->clr |= wa->clr;
-                       wa_->read |= wa->read;
-                       return;
+                       wa_->set &= ~wa->clr;
                }
+
+               wal->wa_count++;
+               wa_->set |= wa->set;
+               wa_->clr |= wa->clr;
+               wa_->read |= wa->read;
+               return;
        }
 
        wal->wa_count++;
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx