diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-01 09:05:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-01 09:05:54 +1000 |
| commit | 5f7f8f6edbf860abf18149a64be036d4be5e2993 (patch) | |
| tree | 4dc508b8b13431758db78f7ada3e7d0a505c3323 /include | |
| parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
| parent | 1cfa126c52af20c36e6a618e45c5449d1025ae55 (diff) | |
| download | linux-stable-5f7f8f6edbf860abf18149a64be036d4be5e2993.tar.gz linux-stable-5f7f8f6edbf860abf18149a64be036d4be5e2993.tar.bz2 linux-stable-5f7f8f6edbf860abf18149a64be036d4be5e2993.zip | |
Merge branch 'drm-fixes-staging' of ssh://people.freedesktop.org/~/linux into drm-fixes
Pull the staging fixes tree I had into rc3 to make real -fixes again.
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 |