mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

atomisp: remove contiguous handling

Browse source 
The base hmm MMU code doesn't support contiguous allocations (they BUG), so
remove support from them from the higher levels of the heirarchy.

We still need to unwind all these layers but it turns out that some of the init
order stuff is rather sensitive and the simple cleanup breaks everything

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Cox 2017-04-12 19:21:59 +01:00 committed by Greg Kroah-Hartman
parent 94853b658a
commit d6f2b57159
4 changed files with 15 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c
View file

@ -31,31 +31,18 @@ mmgr_malloc(const size_t size)
hrt_vaddress mmgr_alloc_attr(const size_t size, const uint16_t attrs)
{
uint16_t masked_attrs = attrs & MMGR_ATTRIBUTE_MASK;
WARN_ON(attrs & MMGR_ATTRIBUTE_CONTIGUOUS);
if (masked_attrs & MMGR_ATTRIBUTE_CLEARED) {
if (masked_attrs & MMGR_ATTRIBUTE_CACHED) {
if (masked_attrs & MMGR_ATTRIBUTE_CONTIGUOUS)
return (ia_css_ptr) hrt_isp_css_mm_calloc_contiguous(size);
else
return (ia_css_ptr) hrt_isp_css_mm_calloc_cached(size);
} else {
if (masked_attrs & MMGR_ATTRIBUTE_CONTIGUOUS)
return (ia_css_ptr) hrt_isp_css_mm_calloc_contiguous(size);
else
return (ia_css_ptr) hrt_isp_css_mm_calloc(size);
}
if (masked_attrs & MMGR_ATTRIBUTE_CACHED)
return (ia_css_ptr) hrt_isp_css_mm_calloc_cached(size);
else
return (ia_css_ptr) hrt_isp_css_mm_calloc(size);
} else {
if (masked_attrs & MMGR_ATTRIBUTE_CACHED) {
if (masked_attrs & MMGR_ATTRIBUTE_CONTIGUOUS)
return (ia_css_ptr) hrt_isp_css_mm_alloc_contiguous(size);
else
return (ia_css_ptr) hrt_isp_css_mm_alloc_cached(size);
} else {
if (masked_attrs & MMGR_ATTRIBUTE_CONTIGUOUS)
return (ia_css_ptr) hrt_isp_css_mm_alloc_contiguous(size);
else
return (ia_css_ptr) hrt_isp_css_mm_alloc(size);
}
if (masked_attrs & MMGR_ATTRIBUTE_CACHED)
return (ia_css_ptr) hrt_isp_css_mm_alloc_cached(size);
else
return (ia_css_ptr) hrt_isp_css_mm_alloc(size);
}
}

11
drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c
View file

@ -180,14 +180,3 @@ phys_addr_t hrt_isp_css_virt_to_phys(ia_css_ptr virt_addr)
return hmm_virt_to_phys(virt_addr);
}
ia_css_ptr hrt_isp_css_mm_alloc_contiguous(size_t bytes)
{
BUG_ON(false);
return 0;
}
ia_css_ptr hrt_isp_css_mm_calloc_contiguous(size_t bytes)
{
BUG_ON(false);
return 0;
}

3
drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
View file

@ -81,8 +81,5 @@ int hrt_isp_css_mm_store_int(ia_css_ptr virt_addr, int data);
the display driver on the FPGA system */
phys_addr_t hrt_isp_css_virt_to_phys(ia_css_ptr virt_addr);
ia_css_ptr hrt_isp_css_mm_alloc_contiguous(size_t bytes);
ia_css_ptr hrt_isp_css_mm_calloc_contiguous(size_t bytes);
void hrt_isp_css_mm_clear(void);
#endif /* _hive_isp_css_mm_hrt_h_ */

31
drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c
View file

@ -60,42 +60,23 @@ ia_css_ptr mmgr_alloc_attr(const size_t size, const uint16_t attribute)
assert(page_table_base_address != (sys_address)-1);
assert((attribute & MMGR_ATTRIBUTE_UNUSED) == 0);
WARN_ON(attribute & MMGR_ATTRIBUTE_CONTIGUOUS);
if (attribute & MMGR_ATTRIBUTE_CLEARED) {
if (attribute & MMGR_ATTRIBUTE_CACHED) {
if (attribute & MMGR_ATTRIBUTE_CONTIGUOUS) /* { */
ptr = hrt_isp_css_mm_calloc_contiguous(
ptr = hrt_isp_css_mm_calloc_cached(
aligned_size + extra_space);
/* } */ else /* { */
ptr = hrt_isp_css_mm_calloc_cached(
aligned_size + extra_space);
/* } */
} else { /* !MMGR_ATTRIBUTE_CACHED */
if (attribute & MMGR_ATTRIBUTE_CONTIGUOUS) /* { */
ptr = hrt_isp_css_mm_calloc_contiguous(
ptr = hrt_isp_css_mm_calloc(
aligned_size + extra_space);
/* } */ else /* { */
ptr = hrt_isp_css_mm_calloc(
aligned_size + extra_space);
/* } */
}
} else { /* MMGR_ATTRIBUTE_CLEARED */
if (attribute & MMGR_ATTRIBUTE_CACHED) {
if (attribute & MMGR_ATTRIBUTE_CONTIGUOUS) /* { */
ptr = hrt_isp_css_mm_alloc_contiguous(
ptr = hrt_isp_css_mm_alloc_cached(
aligned_size + extra_space);
/* } */ else /* { */
ptr = hrt_isp_css_mm_alloc_cached(
aligned_size + extra_space);
/* } */
} else { /* !MMGR_ATTRIBUTE_CACHED */
if (attribute & MMGR_ATTRIBUTE_CONTIGUOUS) /* { */
ptr = hrt_isp_css_mm_alloc_contiguous(
aligned_size + extra_space);
/* } */ else /* { */
ptr = hrt_isp_css_mm_alloc(
aligned_size + extra_space);
/* } */
ptr = hrt_isp_css_mm_alloc(
aligned_size + extra_space);
}
}
return ptr;