From: Dave Airlie <airlied@redhat.com>
Date: Thu, 24 Nov 2016 23:03:27 +0000 (+1000)
Subject: Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4d5304d87034fe3f003cffa7ef2350d066ef7f3e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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
---

4d5304d87034fe3f003cffa7ef2350d066ef7f3e
diff --cc drivers/gpu/drm/armada/armada_overlay.c
index 152b4e716269,41fc28b1e7d1..6743615232f5
--- a/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;