Commit 20561da3 authored by Dave Airlie's avatar Dave Airlie

Revert "drm/i915/gem: Delete unused code"

These commits caused a regression on Lenovo t520 sandybridge
machine belonging to reporter. We are reverting them for 5.10
for other reasons, so just do it for 5.9 as well.

This reverts commit 7ac2d253.
Reported-by: default avatarHarald Arnesen <harald@skogtun.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ad5d95e4
...@@ -965,6 +965,25 @@ static void reloc_cache_init(struct reloc_cache *cache, ...@@ -965,6 +965,25 @@ static void reloc_cache_init(struct reloc_cache *cache,
cache->target = NULL; cache->target = NULL;
} }
static inline void *unmask_page(unsigned long p)
{
return (void *)(uintptr_t)(p & PAGE_MASK);
}
static inline unsigned int unmask_flags(unsigned long p)
{
return p & ~PAGE_MASK;
}
#define KMAP 0x4 /* after CLFLUSH_FLAGS */
static inline struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)
{
struct drm_i915_private *i915 =
container_of(cache, struct i915_execbuffer, reloc_cache)->i915;
return &i915->ggtt;
}
#define RELOC_TAIL 4 #define RELOC_TAIL 4
static int reloc_gpu_chain(struct reloc_cache *cache) static int reloc_gpu_chain(struct reloc_cache *cache)
......
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