Skip to content

L
linux
Commit 4135d9f8 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files
Options

drm/ttm: Remove TTM dma tracepoint since it's not required anymore 

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 79ba2800
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 207 deletions
drivers/gpu/drm/ttm/Makefile
View file @ 4135d9f8
......@@ -4,7 +4,7 @@
ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \
ttm_bo_util.o ttm_bo_vm.o ttm_module.o \
ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \
ttm_bo_manager.o ttm_page_alloc_dma.o ttm_debug.o ttm_tracepoints.o
ttm_bo_manager.o ttm_page_alloc_dma.o
ttm-$(CONFIG_AGP) += ttm_agp_backend.o
obj-$(CONFIG_DRM_TTM) += ttm.o
drivers/gpu/drm/ttm/ttm_debug.c deleted 100644 → 0
View file @ 79ba2800
/**************************************************************************
*
* Copyright (c) 2017 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: Tom St Denis <tom.stdenis@amd.com>
*/
#include <linux/sched.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
#include <linux/shmem_fs.h>
#include <linux/file.h>
#include <linux/swap.h>
#include <linux/slab.h>
#include <linux/export.h>
#include <drm/drm_cache.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_page_alloc.h>
#include "ttm_trace.h"
void ttm_trace_dma_map(struct device *dev, struct ttm_dma_tt *tt)
{
unsigned i;
if (unlikely(trace_ttm_dma_map_enabled())) {
for (i = 0; i < tt->ttm.num_pages; i++) {
trace_ttm_dma_map(
dev,
tt->ttm.pages[i],
tt->dma_address[i]);
}
}
}
EXPORT_SYMBOL(ttm_trace_dma_map);
void ttm_trace_dma_unmap(struct device *dev, struct ttm_dma_tt *tt)
{
unsigned i;
if (unlikely(trace_ttm_dma_unmap_enabled())) {
for (i = 0; i < tt->ttm.num_pages; i++) {
trace_ttm_dma_unmap(
dev,
tt->ttm.pages[i],
tt->dma_address[i]);
}
}
}
EXPORT_SYMBOL(ttm_trace_dma_unmap);
drivers/gpu/drm/ttm/ttm_trace.h deleted 100644 → 0
View file @ 79ba2800
/**************************************************************************
*
* Copyright (c) 2017 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: Tom St Denis <tom.stdenis@amd.com>
*/
#if !defined(_TTM_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TTM_TRACE_H_
#include <linux/stringify.h>
#include <linux/types.h>
#include <linux/tracepoint.h>
#include <drm/drmP.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM ttm
#define TRACE_INCLUDE_FILE ttm_trace
TRACE_EVENT(ttm_dma_map,
TP_PROTO(struct device *dev, struct page *page, dma_addr_t dma_address),
TP_ARGS(dev, page, dma_address),
TP_STRUCT__entry(
__string(device, dev_name(dev))
__field(dma_addr_t, dma)
__field(phys_addr_t, phys)
),
TP_fast_assign(
__assign_str(device, dev_name(dev));
__entry->dma = dma_address;
__entry->phys = page_to_phys(page);
),
TP_printk("%s: %pad => %pa",
__get_str(device),
&__entry->dma,
&__entry->phys)
);
TRACE_EVENT(ttm_dma_unmap,
TP_PROTO(struct device *dev, struct page *page, dma_addr_t dma_address),
TP_ARGS(dev, page, dma_address),
TP_STRUCT__entry(
__string(device, dev_name(dev))
__field(dma_addr_t, dma)
__field(phys_addr_t, phys)
),
TP_fast_assign(
__assign_str(device, dev_name(dev));
__entry->dma = dma_address;
__entry->phys = page_to_phys(page);
),
TP_printk("%s: %pad => %pa",
__get_str(device),
&__entry->dma,
&__entry->phys)
);
#endif
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/ttm/
#include <trace/define_trace.h>
drivers/gpu/drm/ttm/ttm_tracepoints.c deleted 100644 → 0
View file @ 79ba2800
/**************************************************************************
*
* Copyright (c) 2017 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: Tom St Denis <tom.stdenis@amd.com>
*/
#include <linux/sched.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
#include <linux/shmem_fs.h>
#include <linux/file.h>
#include <linux/swap.h>
#include <linux/slab.h>
#include <linux/export.h>
#include <drm/drm_cache.h>
#include <drm/ttm/ttm_module.h>
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_page_alloc.h>
#define CREATE_TRACE_POINTS
#include "ttm_trace.h"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7