GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-22 23:04:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm,io-mapping: Specify slot to use for atomic mappings

Browse source 
This is required should we ever attempt to use an io-mapping where
KM_USER0 is verboten, such as inside an IRQ context.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Chris Wilson 2010-08-04 14:34:24 +01:00 • committed by Dave Airlie
parent 430f70d59d
commit fca3ec01e0
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/linux/io-mapping.h
View file

@ -79,7 +79,9 @@ io_mapping_free(struct io_mapping *mapping)
/* Atomic map/unmap */
static inline void *
io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset)
io_mapping_map_atomic_wc(struct io_mapping *mapping,
unsigned long offset,
int slot)
{
resource_size_t phys_addr;
unsigned long pfn;
@ -87,13 +89,13 @@ io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset)
BUG_ON(offset >= mapping->size);
phys_addr = mapping->base + offset;
pfn = (unsigned long) (phys_addr >> PAGE_SHIFT);
return iomap_atomic_prot_pfn(pfn, KM_USER0, mapping->prot);
return iomap_atomic_prot_pfn(pfn, slot, mapping->prot);
}
static inline void
io_mapping_unmap_atomic(void *vaddr)
io_mapping_unmap_atomic(void *vaddr, int slot)
{
iounmap_atomic(vaddr, KM_USER0);
iounmap_atomic(vaddr, slot);
}
static inline void *
@ -133,13 +135,15 @@ io_mapping_free(struct io_mapping *mapping)
/* Atomic map/unmap */
static inline void *
io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset)
io_mapping_map_atomic_wc(struct io_mapping *mapping,
unsigned long offset,
int slot)
{
return ((char *) mapping) + offset;
}
static inline void
io_mapping_unmap_atomic(void *vaddr)
io_mapping_unmap_atomic(void *vaddr, int slot)
{
}