| Message ID | 20170918173350.9543-5-tom.stdenis@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 18.09.2017 um 19:33 schrieb Tom St Denis: > Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Mhm, I sometimes have good use for those. But just adding a printk at the right place does the job as well. So patch is Reviewed-by: Christian König <christian.koenig@amd.com>. Regards, Christian. > --- > drivers/gpu/drm/ttm/Makefile | 2 +- > drivers/gpu/drm/ttm/ttm_debug.c | 74 ----------------------------- > drivers/gpu/drm/ttm/ttm_trace.h | 87 ----------------------------------- > drivers/gpu/drm/ttm/ttm_tracepoints.c | 45 ------------------ > 4 files changed, 1 insertion(+), 207 deletions(-) > delete mode 100644 drivers/gpu/drm/ttm/ttm_debug.c > delete mode 100644 drivers/gpu/drm/ttm/ttm_trace.h > delete mode 100644 drivers/gpu/drm/ttm/ttm_tracepoints.c > > diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile > index ab2bef1219e5..4d0c938ff4b2 100644 > --- a/drivers/gpu/drm/ttm/Makefile > +++ b/drivers/gpu/drm/ttm/Makefile > @@ -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 > diff --git a/drivers/gpu/drm/ttm/ttm_debug.c b/drivers/gpu/drm/ttm/ttm_debug.c > deleted file mode 100644 > index ef5f0d090154..000000000000 > --- a/drivers/gpu/drm/ttm/ttm_debug.c > +++ /dev/null > @@ -1,74 +0,0 @@ > -/************************************************************************** > - * > - * 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); > - > diff --git a/drivers/gpu/drm/ttm/ttm_trace.h b/drivers/gpu/drm/ttm/ttm_trace.h > deleted file mode 100644 > index 715ce68b7b33..000000000000 > --- a/drivers/gpu/drm/ttm/ttm_trace.h > +++ /dev/null > @@ -1,87 +0,0 @@ > -/************************************************************************** > - * > - * 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> > - > diff --git a/drivers/gpu/drm/ttm/ttm_tracepoints.c b/drivers/gpu/drm/ttm/ttm_tracepoints.c > deleted file mode 100644 > index 861a6266822b..000000000000 > --- a/drivers/gpu/drm/ttm/ttm_tracepoints.c > +++ /dev/null > @@ -1,45 +0,0 @@ > -/************************************************************************** > - * > - * 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"
On 19/09/17 07:13 AM, Christian König wrote: > Am 18.09.2017 um 19:33 schrieb Tom St Denis: >> Signed-off-by: Tom St Denis <tom.stdenis@amd.com> > > Mhm, I sometimes have good use for those. But just adding a printk at > the right place does the job as well. > > So patch is Reviewed-by: Christian König <christian.koenig@amd.com>. Well if you want to keep them we should not apply patch #3 then since we're the only users of it :-) I'm ok with dropping #3/#4 if you want (also less work for Alex since we won't have to prune that history out of the branch we submit upstream). umr has already been ported over to the new iova file though so it won't be using the trace. Cheers, Tom > > Regards, > Christian. > >> --- >> drivers/gpu/drm/ttm/Makefile | 2 +- >> drivers/gpu/drm/ttm/ttm_debug.c | 74 >> ----------------------------- >> drivers/gpu/drm/ttm/ttm_trace.h | 87 >> ----------------------------------- >> drivers/gpu/drm/ttm/ttm_tracepoints.c | 45 ------------------ >> 4 files changed, 1 insertion(+), 207 deletions(-) >> delete mode 100644 drivers/gpu/drm/ttm/ttm_debug.c >> delete mode 100644 drivers/gpu/drm/ttm/ttm_trace.h >> delete mode 100644 drivers/gpu/drm/ttm/ttm_tracepoints.c >> >> diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile >> index ab2bef1219e5..4d0c938ff4b2 100644 >> --- a/drivers/gpu/drm/ttm/Makefile >> +++ b/drivers/gpu/drm/ttm/Makefile >> @@ -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 >> diff --git a/drivers/gpu/drm/ttm/ttm_debug.c >> b/drivers/gpu/drm/ttm/ttm_debug.c >> deleted file mode 100644 >> index ef5f0d090154..000000000000 >> --- a/drivers/gpu/drm/ttm/ttm_debug.c >> +++ /dev/null >> @@ -1,74 +0,0 @@ >> -/************************************************************************** >> >> - * >> - * 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); >> - >> diff --git a/drivers/gpu/drm/ttm/ttm_trace.h >> b/drivers/gpu/drm/ttm/ttm_trace.h >> deleted file mode 100644 >> index 715ce68b7b33..000000000000 >> --- a/drivers/gpu/drm/ttm/ttm_trace.h >> +++ /dev/null >> @@ -1,87 +0,0 @@ >> -/************************************************************************** >> >> - * >> - * 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> >> - >> diff --git a/drivers/gpu/drm/ttm/ttm_tracepoints.c >> b/drivers/gpu/drm/ttm/ttm_tracepoints.c >> deleted file mode 100644 >> index 861a6266822b..000000000000 >> --- a/drivers/gpu/drm/ttm/ttm_tracepoints.c >> +++ /dev/null >> @@ -1,45 +0,0 @@ >> -/************************************************************************** >> >> - * >> - * 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" > >
Am 19.09.2017 um 13:15 schrieb Tom St Denis: > On 19/09/17 07:13 AM, Christian König wrote: >> Am 18.09.2017 um 19:33 schrieb Tom St Denis: >>> Signed-off-by: Tom St Denis <tom.stdenis@amd.com> >> >> Mhm, I sometimes have good use for those. But just adding a printk at >> the right place does the job as well. >> >> So patch is Reviewed-by: Christian König <christian.koenig@amd.com>. > > Well if you want to keep them we should not apply patch #3 then since > we're the only users of it :-) > > I'm ok with dropping #3/#4 if you want (also less work for Alex since > we won't have to prune that history out of the branch we submit > upstream). Please remove that for now. The next time I need it I can cleanup and resubmit the patches so that they work for all drivers in the kernel. Christian. > > umr has already been ported over to the new iova file though so it > won't be using the trace. > > Cheers, > Tom > > >> >> Regards, >> Christian. >> >>> --- >>> drivers/gpu/drm/ttm/Makefile | 2 +- >>> drivers/gpu/drm/ttm/ttm_debug.c | 74 >>> ----------------------------- >>> drivers/gpu/drm/ttm/ttm_trace.h | 87 >>> ----------------------------------- >>> drivers/gpu/drm/ttm/ttm_tracepoints.c | 45 ------------------ >>> 4 files changed, 1 insertion(+), 207 deletions(-) >>> delete mode 100644 drivers/gpu/drm/ttm/ttm_debug.c >>> delete mode 100644 drivers/gpu/drm/ttm/ttm_trace.h >>> delete mode 100644 drivers/gpu/drm/ttm/ttm_tracepoints.c >>> >>> diff --git a/drivers/gpu/drm/ttm/Makefile >>> b/drivers/gpu/drm/ttm/Makefile >>> index ab2bef1219e5..4d0c938ff4b2 100644 >>> --- a/drivers/gpu/drm/ttm/Makefile >>> +++ b/drivers/gpu/drm/ttm/Makefile >>> @@ -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 >>> diff --git a/drivers/gpu/drm/ttm/ttm_debug.c >>> b/drivers/gpu/drm/ttm/ttm_debug.c >>> deleted file mode 100644 >>> index ef5f0d090154..000000000000 >>> --- a/drivers/gpu/drm/ttm/ttm_debug.c >>> +++ /dev/null >>> @@ -1,74 +0,0 @@ >>> -/************************************************************************** >>> >>> - * >>> - * 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); >>> - >>> diff --git a/drivers/gpu/drm/ttm/ttm_trace.h >>> b/drivers/gpu/drm/ttm/ttm_trace.h >>> deleted file mode 100644 >>> index 715ce68b7b33..000000000000 >>> --- a/drivers/gpu/drm/ttm/ttm_trace.h >>> +++ /dev/null >>> @@ -1,87 +0,0 @@ >>> -/************************************************************************** >>> >>> - * >>> - * 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> >>> - >>> diff --git a/drivers/gpu/drm/ttm/ttm_tracepoints.c >>> b/drivers/gpu/drm/ttm/ttm_tracepoints.c >>> deleted file mode 100644 >>> index 861a6266822b..000000000000 >>> --- a/drivers/gpu/drm/ttm/ttm_tracepoints.c >>> +++ /dev/null >>> @@ -1,45 +0,0 @@ >>> -/************************************************************************** >>> >>> - * >>> - * 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" >> >> >
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index ab2bef1219e5..4d0c938ff4b2 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -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 diff --git a/drivers/gpu/drm/ttm/ttm_debug.c b/drivers/gpu/drm/ttm/ttm_debug.c deleted file mode 100644 index ef5f0d090154..000000000000 --- a/drivers/gpu/drm/ttm/ttm_debug.c +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************** - * - * 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); - diff --git a/drivers/gpu/drm/ttm/ttm_trace.h b/drivers/gpu/drm/ttm/ttm_trace.h deleted file mode 100644 index 715ce68b7b33..000000000000 --- a/drivers/gpu/drm/ttm/ttm_trace.h +++ /dev/null @@ -1,87 +0,0 @@ -/************************************************************************** - * - * 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> - diff --git a/drivers/gpu/drm/ttm/ttm_tracepoints.c b/drivers/gpu/drm/ttm/ttm_tracepoints.c deleted file mode 100644 index 861a6266822b..000000000000 --- a/drivers/gpu/drm/ttm/ttm_tracepoints.c +++ /dev/null @@ -1,45 +0,0 @@ -/************************************************************************** - * - * 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"
Signed-off-by: Tom St Denis <tom.stdenis@amd.com> --- drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_debug.c | 74 ----------------------------- drivers/gpu/drm/ttm/ttm_trace.h | 87 ----------------------------------- drivers/gpu/drm/ttm/ttm_tracepoints.c | 45 ------------------ 4 files changed, 1 insertion(+), 207 deletions(-) delete mode 100644 drivers/gpu/drm/ttm/ttm_debug.c delete mode 100644 drivers/gpu/drm/ttm/ttm_trace.h delete mode 100644 drivers/gpu/drm/ttm/ttm_tracepoints.c