From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH] drm/i915: Record error batch buffers using iomem Date: Tue, 11 May 2010 11:37:22 -0400 Message-ID: <20100511113722.65ab2f4a.akpm@linux-foundation.org> References: <0100511104818.8382a7de.akpm@linux-foundation.org> <1273602134-6359-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1273602134-6359-1-git-send-email-chris@chris-wilson.co.uk> Sender: linux-kernel-owner@vger.kernel.org To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org, Jaswinder Singh Rajput , dri-devel@lists.freedesktop.org, Dave Airlie , linux-kernel@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 11 May 2010 19:22:14 +0100 Chris Wilson wrote: > + reloc_offset = src_priv->gtt_offset; > for (page = 0; page < page_count; page++) { > - void *s, *d = kmalloc(PAGE_SIZE, GFP_ATOMIC); > + void __iomem *s; > + void *d; > + > + d = kmalloc(PAGE_SIZE, GFP_ATOMIC); > if (d == NULL) > goto unwind; > - s = kmap_atomic(src_priv->pages[page], KM_USER0); > - memcpy(d, s, PAGE_SIZE); > - kunmap_atomic(s, KM_USER0); > + > + s = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping, > + reloc_offset); > + memcpy_fromio(d, s, PAGE_SIZE); > + io_mapping_unmap_atomic(s); As mentioned in the other email, this will still corrupt the KM_USER0 slot, and will generate a debug_kmap_atomic() warning.