aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_gpu_error.c
diff options
context:
space:
mode:
authorGravatar Chris Wilson <chris@chris-wilson.co.uk> 2016-08-19 16:54:27 +0100
committerGravatar Chris Wilson <chris@chris-wilson.co.uk> 2016-08-19 17:13:35 +0100
commitf7bbe7883c3f119714fd09a8ceaac8075ba04dfe (patch)
tree3a9ebf6c9bb5899ee1c1dab1d8e83430af43b1d9 /drivers/gpu/drm/i915/i915_gpu_error.c
parentio-mapping: Always create a struct to hold metadata about the io-mapping (diff)
downloadlinux-f7bbe7883c3f119714fd09a8ceaac8075ba04dfe.tar.gz
linux-f7bbe7883c3f119714fd09a8ceaac8075ba04dfe.tar.bz2
linux-f7bbe7883c3f119714fd09a8ceaac8075ba04dfe.zip
drm/i915: Embed the io-mapping struct inside drm_i915_private
As io_mapping.h now always allocates the struct, we can avoid that allocation and extra pointer dance by embedding the struct inside drm_i915_private Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20160819155428.1670-5-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 84dd5bc06db3..41ec7a183c73 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -729,7 +729,7 @@ i915_error_object_create(struct drm_i915_private *dev_priv,
* captures what the GPU read.
*/
- s = io_mapping_map_atomic_wc(ggtt->mappable,
+ s = io_mapping_map_atomic_wc(&ggtt->mappable,
reloc_offset);
memcpy_fromio(d, s, PAGE_SIZE);
io_mapping_unmap_atomic(s);