Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

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

diff --cc drivers/gpu/drm/armada/armada_crtc.c
Simple merge

diff --cc drivers/gpu/drm/armada/armada_drv.c
Simple merge

diff --cc drivers/gpu/drm/armada/armada_gem.c
Simple merge

diff --cc drivers/gpu/drm/armada/armada_overlay.c
index 152b4e7,41fc28b..6743615
--- 1/drivers/gpu/drm/armada/armada_overlay.c
--- 2/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@@ -120,8 -119,12 +119,12 @@@ armada_ovl_plane_update(struct drm_plan
        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),
 +                                          DRM_ROTATE_0,
                                            0, INT_MAX, true, false, &visible);
        if (ret)
                return ret;