diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 49c5a1798ac4..dc2e6fdb6ca3 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -182,7 +182,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, | |||
182 | * happens to let us map card memory without taking IPIs. When the vmap | 182 | * happens to let us map card memory without taking IPIs. When the vmap |
183 | * rework lands we should be able to dump this hack. | 183 | * rework lands we should be able to dump this hack. |
184 | */ | 184 | */ |
185 | static inline int fast_user_write(unsigned long pfn, char __user *user_data, int l) | 185 | static inline int fast_user_write(unsigned long pfn, char __user *user_data, |
186 | int l, int o) | ||
186 | { | 187 | { |
187 | #ifdef CONFIG_HIGHMEM | 188 | #ifdef CONFIG_HIGHMEM |
188 | unsigned long unwritten; | 189 | unsigned long unwritten; |
@@ -251,7 +252,7 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj, | |||
251 | 252 | ||
252 | pfn = (dev->agp->base >> PAGE_SHIFT) + i; | 253 | pfn = (dev->agp->base >> PAGE_SHIFT) + i; |
253 | 254 | ||
254 | if (!fast_user_write(pfn, user_data, l)) { | 255 | if (!fast_user_write(pfn, user_data, l, o)) { |
255 | unsigned long unwritten; | 256 | unsigned long unwritten; |
256 | char __iomem *vaddr; | 257 | char __iomem *vaddr; |
257 | 258 | ||