diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-05-14 13:41:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-14 13:41:51 +1000 |
| commit | 80c9b58e9503f33a707a23172b2dd8d015b8c036 (patch) | |
| tree | 6612c89ee660afaebc3e57a4fb24eeeda841ea4a /drivers/gpu/drm/drm_blend.c | |
| parent | 49eea1c6573a6e31d79783c716b9001c968e5662 (diff) | |
| parent | 7982471d01aac33994276bf567c8f1f3a137648a (diff) | |
| download | linux-80c9b58e9503f33a707a23172b2dd8d015b8c036.tar.gz linux-80c9b58e9503f33a707a23172b2dd8d015b8c036.tar.bz2 linux-80c9b58e9503f33a707a23172b2dd8d015b8c036.zip | |
Merge tag 'du-next-20200514' of git://linuxtv.org/pinchartl/media into drm-next
R-Car Display Unit & related changes:
- DT bindings conversion to YAML
- Planes zpos sanity check and fix
- MAINTAINERS entry for LVDS panel driver
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200514012844.GA7196@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/drm_blend.c')
| -rw-r--r-- | drivers/gpu/drm/drm_blend.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c index 88eedee018d3..f1dcad96f341 100644 --- a/drivers/gpu/drm/drm_blend.c +++ b/drivers/gpu/drm/drm_blend.c @@ -135,7 +135,9 @@ * are underneath planes with higher Z position values. Two planes with the * same Z position value have undefined ordering. Note that the Z position * value can also be immutable, to inform userspace about the hard-coded - * stacking of planes, see drm_plane_create_zpos_immutable_property(). + * stacking of planes, see drm_plane_create_zpos_immutable_property(). If + * any plane has a zpos property (either mutable or immutable), then all + * planes shall have a zpos property. * * pixel blend mode: * Pixel blend mode is set up with drm_plane_create_blend_mode_property(). @@ -344,10 +346,10 @@ EXPORT_SYMBOL(drm_rotation_simplify); * should be set to 0 and max to maximal number of planes for given crtc - 1. * * If zpos of some planes cannot be changed (like fixed background or - * cursor/topmost planes), driver should adjust min/max values and assign those - * planes immutable zpos property with lower or higher values (for more + * cursor/topmost planes), drivers shall adjust the min/max values and assign + * those planes immutable zpos properties with lower or higher values (for more * information, see drm_plane_create_zpos_immutable_property() function). In such - * case driver should also assign proper initial zpos values for all planes in + * case drivers shall also assign proper initial zpos values for all planes in * its plane_reset() callback, so the planes will be always sorted properly. * * See also drm_atomic_normalize_zpos(). |