evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: [sparse] __iomem fixes for gem

Browse source 
As with one of the earlier patches in the series, we're forced to cast
for copy_[to|from]_user. Again because of the nature of the GEN x86
exclusivity, this should be safe.

Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
[danvet: Added some bikeshed.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ben Widawsky 2012-04-16 14:07:47 -07:00 • committed by Daniel Vetter
parent 0d38f00904
commit 4f0c7cfbb4
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/gpu/drm/i915/i915_gem.c
View file

@ -282,8 +282,8 @@ __copy_to_user_swizzled(char __user *cpu_vaddr,
} }
static inline int static inline int
__copy_from_user_swizzled(char __user *gpu_vaddr, int gpu_offset, __copy_from_user_swizzled(char *gpu_vaddr, int gpu_offset,
const char *cpu_vaddr, const char __user *cpu_vaddr,
int length) int length)
{ {
int ret, cpu_offset = 0; int ret, cpu_offset = 0;
@ -558,11 +558,14 @@ fast_user_write(struct io_mapping *mapping,
char __user *user_data, char __user *user_data,
int length) int length)
{ {
char *vaddr_atomic; void __iomem *vaddr_atomic;
void *vaddr;
unsigned long unwritten; unsigned long unwritten;
vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base); vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base);
unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + page_offset, /* We can use the cpu mem copy function because this is X86. */
vaddr = (void __force*)vaddr_atomic + page_offset;
unwritten = __copy_from_user_inatomic_nocache(vaddr,
user_data, length); user_data, length);
io_mapping_unmap_atomic(vaddr_atomic); io_mapping_unmap_atomic(vaddr_atomic);
return unwritten; return unwritten;