Am 26.07.2018 um 11:14 schrieb Huang Rui:
> This patch moves all non-x86 abstraction to the ttm_set_memory header.
> It is to make function calling more clearly.
>
> Suggested-by: Christian König <christian.koenig at amd.com>
> Signed-off-by: Huang Rui <ray.huang at amd.com>
> ---
> include/drm/ttm/ttm_set_memory.h | 127 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 127 insertions(+)
> create mode 100644 include/drm/ttm/ttm_set_memory.h
>
> diff --git a/include/drm/ttm/ttm_set_memory.h b/include/drm/ttm/ttm_set_memory.h
> new file mode 100644
> index 0000000..ceef413
> --- /dev/null
> +++ b/include/drm/ttm/ttm_set_memory.h
> @@ -0,0 +1,127 @@
> +/**************************************************************************
> + *
> + * Copyright (c) 2018 Advanced Micro Devices, Inc.
> + * All Rights Reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
> + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + **************************************************************************/
> +/*
> + * Authors: Huang Rui <ray.huang at amd.com>
> + */
> +
> +#ifndef TTM_SET_MEMORY
> +#define TTM_SET_MEMORY
> +
> +#include <linux/mm.h>
> +
> +#ifdef CONFIG_X86
> +
> +#include <asm/set_memory.h>
> +
> +static inline int ttm_set_page_range_wb(struct page *p, unsigned long numpages)
> +{
> + return set_memory_wb((unsigned long)page_address(p), numpages);
> +}
> +
> +#else /* for CONFIG_X86 */
> +
> +#if IS_ENABLED(CONFIG_AGP)
> +
> +#include <asm/agp.h>
> +
> +static inline int set_pages_array_wb(struct page **pages, int addrinarray)
While at it please add a ttm_ prefix to all those functions.
Additional to that you need to send TTM changes to dri-devel as well and
for some reason patch #3-#5 didn't made it to the mailing list.
Christian.
> +{
> + int i;
> +
> + for (i = 0; i < addrinarray; i++)
> + unmap_page_from_agp(pages[i]);
> + return 0;
> +}
> +
> +static inline int set_pages_array_wc(struct page **pages, int addrinarray)
> +{
> + int i;
> +
> + for (i = 0; i < addrinarray; i++)
> + map_page_into_agp(pages[i]);
> + return 0;
> +}
> +
> +static inline int set_pages_array_uc(struct page **pages, int addrinarray)
> +{
> + int i;
> +
> + for (i = 0; i < addrinarray; i++)
> + map_page_into_agp(pages[i]);
> + return 0;
> +}
> +
> +static inline int ttm_set_page_range_wb(struct page *p, unsigned long numpages)
> +{
> + unsigned long i;
> +
> + for (i = 0; i < numpages; i++)
> + unmap_page_from_agp(p + i);
> + return 0;
> +}
> +
> +static inline int set_pages_wb(struct page *page, int numpages)
> +{
> + int i;
> +
> + for (i = 0; i < numpages; i++)
> + unmap_page_from_agp(page++);
> + return 0;
> +}
> +
> +#else /* for CONFIG_AGP */
> +
> +static inline int set_pages_array_wb(struct page **pages, int addrinarray)
> +{
> + return 0;
> +}
> +
> +static inline int set_pages_array_wc(struct page **pages, int addrinarray)
> +{
> + return 0;
> +}
> +
> +static inline int set_pages_array_uc(struct page **pages, int addrinarray)
> +{
> + return 0;
> +}
> +
> +static inline int ttm_set_page_range_wb(struct page *p, unsigned long numpages)
> +{
> + return 0;
> +}
> +
> +static inline int set_pages_wb(struct page *page, int numpages)
> +{
> + return 0;
> +}
> +
> +#endif /* for CONFIG_AGP */
> +
> +#endif /* for CONFIG_X86 */
> +
> +#endif
