mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-07 20:19:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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 7ac2d2536d.

Reported-by: Harald Arnesen <harald@skogtun.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2020-09-08 15:41:43 +10:00
parent ad5d95e4d5
commit 20561da3a2
1 changed files with 19 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
View file

@ -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)