Commit 91e630b9 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Use binary search when looking up forcewake domains

Instead of the existing linear seach, now that we have sorted
range tables, we can do a binary search on them for some
potential miniscule performance gain, but more importantly
for elegance and code size. Hopefully the perfomance gain is
sufficient to offset the function calls which were not there
before.

v2: Removed const cast away.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent b0081239
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "i915_vgpu.h" #include "i915_vgpu.h"
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/bsearch.h>
#define FORCEWAKE_ACK_TIMEOUT_MS 50 #define FORCEWAKE_ACK_TIMEOUT_MS 50
...@@ -589,20 +590,30 @@ struct intel_forcewake_range ...@@ -589,20 +590,30 @@ struct intel_forcewake_range
enum forcewake_domains domains; enum forcewake_domains domains;
}; };
static int fw_range_cmp(const void *key, const void *elt)
{
const struct intel_forcewake_range *entry = elt;
u32 offset = (u32)((unsigned long)key);
if (offset < entry->start)
return -1;
else if (offset > entry->end)
return 1;
else
return 0;
}
static enum forcewake_domains static enum forcewake_domains
find_fw_domain(u32 offset, const struct intel_forcewake_range *ranges, find_fw_domain(u32 offset, const struct intel_forcewake_range *ranges,
unsigned int num_ranges) unsigned int num_ranges)
{ {
unsigned int i; struct intel_forcewake_range *entry;
struct intel_forcewake_range *entry =
(struct intel_forcewake_range *)ranges;
for (i = 0; i < num_ranges; i++, entry++) { entry = bsearch((void *)(unsigned long)offset, (const void *)ranges,
if (offset >= entry->start && offset <= entry->end) num_ranges, sizeof(struct intel_forcewake_range),
return entry->domains; fw_range_cmp);
}
return -1; return entry ? entry->domains : -1;
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment