From f4f90b239e72dc071d47d92b90a0bfc3a6b62949 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= Date: Sun, 8 Mar 2015 10:03:37 +0100 Subject: [PATCH] drm/i915: Replace kmem_alloc_nofault() by kmap() As seen on pre-3.7 Linuxes. --- sys/dev/drm/i915/intel_ringbuffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/drm/i915/intel_ringbuffer.c b/sys/dev/drm/i915/intel_ringbuffer.c index 64ea9e3095..cb4d6855e4 100644 --- a/sys/dev/drm/i915/intel_ringbuffer.c +++ b/sys/dev/drm/i915/intel_ringbuffer.c @@ -506,7 +506,7 @@ init_pipe_control(struct intel_ring_buffer *ring) goto err_unref; pc->gtt_offset = obj->gtt_offset; - pc->cpu_page = (uint32_t *)kmem_alloc_nofault(&kernel_map, PAGE_SIZE, PAGE_SIZE); + pc->cpu_page = kmap(obj->pages[0]); if (pc->cpu_page == NULL) { ret = -ENOMEM; goto err_unpin; @@ -1238,8 +1238,7 @@ static int init_status_page(struct intel_ring_buffer *ring) } ring->status_page.gfx_addr = obj->gtt_offset; - ring->status_page.page_addr = (void *)kmem_alloc_nofault(&kernel_map, - PAGE_SIZE, PAGE_SIZE); + ring->status_page.page_addr = kmap(obj->pages[0]); if (ring->status_page.page_addr == NULL) { ret = -ENOMEM; goto err_unpin; -- 2.11.4.GIT