diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-25 09:03:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-25 09:03:27 +1000 |
| commit | 4d5304d87034fe3f003cffa7ef2350d066ef7f3e (patch) | |
| tree | 372222b30b2839382917bf9eece89fe086d5dba4 /drivers/gpu/drm/armada/armada_trace.c | |
| parent | 43167f6c7d7172e0a6cb1ecaa1771a2f457fd165 (diff) | |
| parent | e8e11817e2ff18f35de932cdd2738cad5567cb7c (diff) | |
Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next
Building on top of the MALI change previously merged, these changes:
* add tracing support for overlay updates
* refactor some of the plane support code
* de-midlayer the driver
* cleanups from other folk reviewing the code
* 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm:
drm/armada: fix NULL pointer comparison warning
drm/armada: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
drm/armada: remove some dead code
drm/armada: mark symbols static where possible
drm/armada: de-midlayer armada
drm/armada: use common helper for plane base address
drm/armada: move setting primary plane position to armada_drm_primary_set()
drm/armada: split out primary plane update
drm/armada: move plane state to struct armada_plane
drm/armada: clean up armada_drm_plane_work_run()
drm/armada: add tracing support
Diffstat (limited to 'drivers/gpu/drm/armada/armada_trace.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_trace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/armada/armada_trace.c b/drivers/gpu/drm/armada/armada_trace.c new file mode 100644 index 000000000000..068b336ba75f --- /dev/null +++ b/drivers/gpu/drm/armada/armada_trace.c @@ -0,0 +1,4 @@ +#ifndef __CHECKER__ +#define CREATE_TRACE_POINTS +#include "armada_trace.h" +#endif |