diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-10-28 05:24:14 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-10-28 05:24:14 +0300 |
| commit | aa72c26c2b7aec5f60d9f2bf55e2f00632899ed7 (patch) | |
| tree | 6ba1c8129beff272d08e6aab1c16367aeca02de5 /include | |
| parent | 07d9a380680d1c0eb51ef87ff2eab5c994949e69 (diff) | |
| parent | 4da5caa6a6f82cda3193bca855235b87debf78bd (diff) | |
| download | linux-aa72c26c2b7aec5f60d9f2bf55e2f00632899ed7.tar.xz | |
Merge tag 'drm-misc-fixes-2016-10-27' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Set of drm core fixes.
Hopefully fixes a bug in MST unplugs in fbdev.
* tag 'drm-misc-fixes-2016-10-27' of git://anongit.freedesktop.org/git/drm-misc:
drm/dp/mst: Check peer device type before attempting EDID read
drm/dp/mst: Clear port->pdt when tearing down the i2c adapter
drm/fb-helper: Keep references for the current set of used connectors
drm: Don't force all planes to be added to the state due to zpos
drm/fb-helper: Fix connector ref leak on error
drm/fb-helper: Don't call dirty callback for untouched clips
drm: Release reference from blob lookup after replacing property
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_plane.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 43cf193e54d6..8b4dc62470ff 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -47,8 +47,14 @@ struct drm_crtc; * @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 |