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

drm/armada: add tracing support

Browse source 
Add tracing support to the Armada video overlay and interrupt code.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King 2016-05-17 13:51:08 +01:00
parent 90731c24d2
commit c8a220c686
5 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/armada/Makefile
View file

@ -1,5 +1,5 @@
armada-y := armada_crtc.o armada_drv.o armada_fb.o armada_fbdev.o \
armada_gem.o armada_overlay.o
armada_gem.o armada_overlay.o armada_trace.o
armada-y += armada_510.o
armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o

3
drivers/gpu/drm/armada/armada_crtc.c
View file

@ -18,6 +18,7 @@
#include "armada_fb.h"
#include "armada_gem.h"
#include "armada_hw.h"
#include "armada_trace.h"
struct armada_frame_work {
struct armada_plane_work work;
@ -464,6 +465,8 @@ static irqreturn_t armada_drm_irq(int irq, void *arg)
*/
writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR);
trace_armada_drm_irq(&dcrtc->crtc, stat);
/* Mask out those interrupts we haven't enabled */
v = stat & dcrtc->irq_ena;

7
drivers/gpu/drm/armada/armada_overlay.c
View file

@ -15,6 +15,7 @@
#include "armada_hw.h"
#include <drm/armada_drm.h>
#include "armada_ioctlP.h"
#include "armada_trace.h"
struct armada_ovl_plane_properties {
uint32_t colorkey_yr;
@ -87,6 +88,8 @@ static void armada_ovl_plane_work(struct armada_crtc *dcrtc,
{
struct armada_ovl_plane *dplane = container_of(plane, struct armada_ovl_plane, base);
trace_armada_ovl_plane_work(&dcrtc->crtc, &plane->base);
armada_drm_crtc_update_regs(dcrtc, dplane->vbl.regs);
armada_ovl_retire_fb(dplane, NULL);
}
@ -120,6 +123,10 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
bool visible;
int ret;
trace_armada_ovl_plane_update(plane, crtc, fb,
crtc_x, crtc_y, crtc_w, crtc_h,
src_x, src_y, src_w, src_h);
ret = drm_plane_helper_check_update(plane, crtc, fb, &src, &dest, &clip,
BIT(DRM_ROTATE_0),
0, INT_MAX, true, false, &visible);

4
drivers/gpu/drm/armada/armada_trace.c Normal file
View file

@ -0,0 +1,4 @@
#ifndef __CHECKER__
#define CREATE_TRACE_POINTS
#include "armada_trace.h"
#endif

66
drivers/gpu/drm/armada/armada_trace.h Normal file
View file

@ -0,0 +1,66 @@
#if !defined(ARMADA_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
#define ARMADA_TRACE_H
#include <linux/tracepoint.h>
#include <drm/drmP.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM armada
#define TRACE_INCLUDE_FILE armada_trace
TRACE_EVENT(armada_drm_irq,
TP_PROTO(struct drm_crtc *crtc, u32 stat),
TP_ARGS(crtc, stat),
TP_STRUCT__entry(
__field(struct drm_crtc *, crtc)
__field(u32, stat)
),
TP_fast_assign(
__entry->crtc = crtc;
__entry->stat = stat;
),
TP_printk("crtc %p stat 0x%08x",
__entry->crtc, __entry->stat)
);
TRACE_EVENT(armada_ovl_plane_update,
TP_PROTO(struct drm_plane *plane, struct drm_crtc *crtc,
struct drm_framebuffer *fb,
int crtc_x, int crtc_y, unsigned crtc_w, unsigned crtc_h,
uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h),
TP_ARGS(plane, crtc, fb, crtc_x, crtc_y, crtc_w, crtc_h, src_x, src_y, src_w, src_h),
TP_STRUCT__entry(
__field(struct drm_plane *, plane)
__field(struct drm_crtc *, crtc)
__field(struct drm_framebuffer *, fb)
),
TP_fast_assign(
__entry->plane = plane;
__entry->crtc = crtc;
__entry->fb = fb;
),
TP_printk("plane %p crtc %p fb %p",
__entry->plane, __entry->crtc, __entry->fb)
);
TRACE_EVENT(armada_ovl_plane_work,
TP_PROTO(struct drm_crtc *crtc, struct drm_plane *plane),
TP_ARGS(crtc, plane),
TP_STRUCT__entry(
__field(struct drm_plane *, plane)
__field(struct drm_crtc *, crtc)
),
TP_fast_assign(
__entry->plane = plane;
__entry->crtc = crtc;
),
TP_printk("plane %p crtc %p",
__entry->plane, __entry->crtc)
);
#endif
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#include <trace/define_trace.h>