diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-09-28 05:57:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 12:36:00 -0500 |
| commit | 0198c89767e26f78e619eef2309be74186b4fdcd (patch) | |
| tree | 1f169dd328d36785f3f8d8c0428564f282cb2377 /include | |
| parent | 2f8c09acae88d1bf0aeedffd3f788eb5c5b4db29 (diff) | |
io-mapping: ensure io_mapping_map_atomic _is_ atomic
commit 24dd85ff723f142093f44244764b9b5c152235b8 upstream.
For the !HAVE_ATOMIC_IOMAP case the stub functions did not call
pagefault_disable/_enable. The i915 driver relies on the map
actually being atomic, otherwise it can deadlock with it's own
pagefault handler in the gtt pwrite fastpath.
This is exercised by gem_mmap_gtt from the intel-gpu-toosl gem
testsuite.
v2: Chris Wilson noted the lack of an include.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38115
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/io-mapping.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index 8cdcc2a199a..1feeb526356 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h | |||
| @@ -117,6 +117,8 @@ io_mapping_unmap(void __iomem *vaddr) | |||
| 117 | 117 | ||
| 118 | #else | 118 | #else |
| 119 | 119 | ||
| 120 | #include <linux/uaccess.h> | ||
| 121 | |||
| 120 | /* this struct isn't actually defined anywhere */ | 122 | /* this struct isn't actually defined anywhere */ |
| 121 | struct io_mapping; | 123 | struct io_mapping; |
| 122 | 124 | ||
| @@ -138,12 +140,14 @@ static inline void __iomem * | |||
| 138 | io_mapping_map_atomic_wc(struct io_mapping *mapping, | 140 | io_mapping_map_atomic_wc(struct io_mapping *mapping, |
| 139 | unsigned long offset) | 141 | unsigned long offset) |
| 140 | { | 142 | { |
| 143 | pagefault_disable(); | ||
| 141 | return ((char __force __iomem *) mapping) + offset; | 144 | return ((char __force __iomem *) mapping) + offset; |
| 142 | } | 145 | } |
| 143 | 146 | ||
| 144 | static inline void | 147 | static inline void |
| 145 | io_mapping_unmap_atomic(void __iomem *vaddr) | 148 | io_mapping_unmap_atomic(void __iomem *vaddr) |
| 146 | { | 149 | { |
| 150 | pagefault_enable(); | ||
| 147 | } | 151 | } |
| 148 | 152 | ||
| 149 | /* Non-atomic map/unmap */ | 153 | /* Non-atomic map/unmap */ |