From: Dave Airlie <airlied@redhat.com>
Date: Thu, 10 Nov 2016 23:28:44 +0000 (+1000)
Subject: Merge tag 'topic/drm-misc-2016-11-10' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3e91168a6a76f7e21c44f04ebf953589ca59f03c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'topic/drm-misc-2016-11-10' of git://anongit.freedesktop.org/drm-intel into drm-next

- better atomic state debugging from Rob
- fence prep from gustavo
- sumits flushed out his backlog of pending dma-buf/fence patches from
  various people
- drm_mm leak debugging plus trying to appease Kconfig (Chris)
- a few misc things all over

* tag 'topic/drm-misc-2016-11-10' of git://anongit.freedesktop.org/drm-intel: (35 commits)
  drm: Make DRM_DEBUG_MM depend on STACKTRACE_SUPPORT
  drm/i915: Restrict DRM_DEBUG_MM automatic selection
  drm: Restrict stackdepot usage to builtin drm.ko
  drm/msm: module param to dump state on error irq
  drm/msm/mdp5: add atomic_print_state support
  drm/atomic: add debugfs file to dump out atomic state
  drm/atomic: add new drm_debug bit to dump atomic state
  drm: add helpers to go from plane state to drm_rect
  drm: add helper for printing to log or seq_file
  drm: helper macros to print composite types
  reservation: revert "wait only with non-zero timeout specified (v3)" v2
  drm/ttm: fix ttm_bo_wait
  dma-buf/fence: revert "don't wait when specified timeout is zero" (v2)
  dma-buf/fence: make timeout handling in fence_default_wait consistent (v2)
  drm/amdgpu: add the interface of waiting multiple fences (v4)
  dma-buf: return index of the first signaled fence (v2)
  MAINTAINERS: update Sync File Framework files
  dma-buf/sw_sync: put fence reference from the fence creation
  dma-buf/sw_sync: mark sync_timeline_create() static
  drm: Add stackdepot include for DRM_DEBUG_MM
  ...
---

3e91168a6a76f7e21c44f04ebf953589ca59f03c
diff --cc include/drm/drm_plane.h
index 0bed92c5dbd8,63d4e5051936..5b38eb94783b
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@@ -47,17 -43,10 +43,16 @@@ struct drm_printer
   * @src_h: height of visible portion of plane (in 16.16)
   * @rotation: rotation of the plane
   * @zpos: priority of the given plane on crtc (optional)
 + *	Note that multiple active planes on the same crtc can have an identical
 + *	zpos value. The rule to solving the conflict is to compare the plane
 + *	object IDs; the plane with a higher ID must be stacked on top of a
 + *	plane with a lower ID.
   * @normalized_zpos: normalized value of zpos: unique, range from 0 to N-1
 - *	where N is the number of active planes for given crtc
 + *	where N is the number of active planes for given crtc. Note that
 + *	the driver must call drm_atomic_normalize_zpos() to update this before
 + *	it can be trusted.
   * @src: clipped source coordinates of the plane (in 16.16)
   * @dst: clipped destination coordinates of the plane
-  * @visible: visibility of the plane
   * @state: backpointer to global drm_atomic_state
   */
  struct drm_plane_state {