summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt2009-12-14 22:12:45 +0100
committerEric Anholt2009-12-15 21:11:26 +0100
commit656cb79322319a7bbafec7912d262142e9a38bc0 (patch)
tree1487311cb7331be429611c7272fbb0962aecb38e
parentmfd: compile fix for twl4030 renaming (diff)
downloadkernel-qcow2-linux-656cb79322319a7bbafec7912d262142e9a38bc0.tar.gz
kernel-qcow2-linux-656cb79322319a7bbafec7912d262142e9a38bc0.tar.xz
kernel-qcow2-linux-656cb79322319a7bbafec7912d262142e9a38bc0.zip
drm/i915: In the debugfs interface, unmap our address instead of the page's.
Fixes a BUG_ON in kmap_atomic for the following atomic mapping with USER0 type. Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 18476bf0b580..463e8d0155c2 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -272,7 +272,7 @@ static void i915_dump_pages(struct seq_file *m, struct page **pages, int page_co
mem = kmap_atomic(pages[page], KM_USER0);
for (i = 0; i < PAGE_SIZE; i += 4)
seq_printf(m, "%08x : %08x\n", i, mem[i / 4]);
- kunmap_atomic(pages[page], KM_USER0);
+ kunmap_atomic(mem, KM_USER0);
}
}