drm/radeon: add initial tracepoint support.
Subsystems (2)
Dave Airlie
maintainerPATCH 1/2 drm/radeon: add initial tracepoint support.
From: Dave Airlie <[email protected]>
this adds a bo create, and fence seq tracking tracepoints.
This is just an initial set to play around with, we should investigate what others we need would be useful.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/Makefile | 5 +- drivers/gpu/drm/radeon/radeon_fence.c | 4 + drivers/gpu/drm/radeon/radeon_object.c | 2 + drivers/gpu/drm/radeon/radeon_trace.h | 82 ++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_trace_points.c | 9 +++ 5 files changed, 101 insertions(+), 1 deletions(-) create mode 100644 drivers/gpu/drm/radeon/radeon_trace.h create mode 100644 drivers/gpu/drm/radeon/radeon_trace_points.c
drivers/gpu/drm/radeon/Makefile +4 -1
@@ -65,10 +65,13 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \ r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \ r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ - evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o + evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \ + radeon_trace_points.o radeon-$(CONFIG_COMPAT) += radeon_ioc32.o radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o radeon-$(CONFIG_ACPI) += radeon_acpi.o obj-$(CONFIG_DRM_RADEON)+= radeon.o + +CFLAGS_radeon_trace_points.o := -I$(src)
drivers/gpu/drm/radeon/radeon_fence.c +4 -0
@@ -38,6 +38,7 @@#include "drm.h" #include "radeon_reg.h" #include "radeon.h" +#include "radeon_trace.h" int radeon_fence_emit (struct radeon_device *rdev,struct radeon_fence *fence) {
@@ -57,6 +58,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence) }else radeon_fence_ring_emit (rdev, fence); +trace_radeon_fence_emit (rdev->ddev, fence->seq); fence->emited = true;list_del (&fence->list);list_add_tail (&fence->list, &rdev->fence_drv.emited);
@@ -213,6 +215,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr) retry:/* save current sequence used to check for GPU lockup */ seq = rdev->fence_drv.last_seq; +trace_radeon_fence_wait_begin (rdev->ddev, seq);if (intr) {radeon_irq_kms_sw_irq_get (rdev); r = wait_event_interruptible_timeout(rdev->fence_drv.queue,
@@ -227,6 +230,7 @@ retry: radeon_fence_signaled(fence), timeout);radeon_irq_kms_sw_irq_put (rdev); } +trace_radeon_fence_wait_end (rdev->ddev, seq);if (unlikely (!radeon_fence_signaled (fence))) {/* we were interrupted for some reason and fence isn't * isn't signaled yet, resume wait
drivers/gpu/drm/radeon/radeon_object.c +2 -0
@@ -34,6 +34,7 @@#include <drm/drmP.h> #include "radeon_drm.h" #include "radeon.h" +#include "radeon_trace.h" int radeon_ttm_init (struct radeon_device *rdev);
@@ -137,6 +138,7 @@ retry:list_add_tail (&bo->list, &rdev->gem.objects);mutex_unlock (&bo->rdev->gem.mutex); } +trace_radeon_bo_create (bo);return 0 ; }
drivers/gpu/drm/radeon/radeon_trace.h new file +82 -0
82 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_trace_points.c new file +9 -0
@@ -0,0 +1,9 @@ +/* Copyright Red Hat Inc 2010. +* Author : Dave Airlie <[email protected]> +*/ +#include <drm/drmP.h> +#include "radeon_drm.h" +#include "radeon.h" + +#define CREATE_TRACE_POINTS +#include "radeon_trace.h"
Signature · 1 line
1.7.3.2
Dave Airlie
maintainerPATCH 2/2 drm/radeon/kms: de-inline radeon_bo_wait
From: Dave Airlie <[email protected]>
this function is much to large to be inlined practically.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/radeon_gem.c | 19 +++++++++++++++++++ drivers/gpu/drm/radeon/radeon_object.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-)
drivers/gpu/drm/radeon/radeon_gem.c +19 -0
@@ -30,6 +30,25 @@#include "radeon_drm.h" #include "radeon.h" +static int radeon_bo_wait (struct radeon_bo *bo,u32 *mem_type, +bool no_wait) +{ +int r; + + r =ttm_bo_reserve (&bo->tbo, true, no_wait, false,0 ); +if (unlikely (r !=0 )) +return r; +spin_lock (&bo->tbo.bdev->fence_lock); +if (mem_type) + *mem_type = bo->tbo.mem.mem_type; +if (bo->tbo.sync_obj) + r =ttm_bo_wait (&bo->tbo, true, true, no_wait); +spin_unlock (&bo->tbo.bdev->fence_lock); +ttm_bo_unreserve (&bo->tbo); +return r; +} + +int radeon_gem_object_init (struct drm_gem_object *obj) {/* we do nothings here */
drivers/gpu/drm/radeon/radeon_object.h +0 -18
@@ -118,24 +118,6 @@ static inline u64 radeon_bo_mmap_offset(struct radeon_bo *bo)return bo->tbo.addr_space_offset; } -static inline int radeon_bo_wait (struct radeon_bo *bo,u32 *mem_type, -bool no_wait) -{ -int r; - - r =ttm_bo_reserve (&bo->tbo, true, no_wait, false,0 ); -if (unlikely (r !=0 )) -return r; -spin_lock (&bo->tbo.bdev->fence_lock); -if (mem_type) - *mem_type = bo->tbo.mem.mem_type; -if (bo->tbo.sync_obj) - r =ttm_bo_wait (&bo->tbo, true, true, no_wait); -spin_unlock (&bo->tbo.bdev->fence_lock); -ttm_bo_unreserve (&bo->tbo); -return r; -} - extern int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, unsigned long size, int byte_align,
Signature · 1 line
1.7.3.2