diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-08-03 08:40:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-08-03 08:40:24 +1000 |
| commit | 586efded6b8beb932e9a356f351b0c681503358f (patch) | |
| tree | 1c9af56fa0d2c70bf93cf5a02429f4b5b7d11007 /Documentation | |
| parent | dfd2e9ab6a7db56a5f5bb55f71485a92613c8e11 (diff) | |
| parent | 2fc4d838aaf2607216eda5ce9dba18fa14422a31 (diff) | |
| download | linux-0-day-586efded6b8beb932e9a356f351b0c681503358f.tar.gz linux-0-day-586efded6b8beb932e9a356f351b0c681503358f.tar.xz | |
Merge branch 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
Merge generic ZPOS property support, this was backed up behind some other
changes I didn't have a stable branch point for. Now they are merged to Linus
tree this pull is just drm patches.
* 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel:
drm: rcar: use generic code for managing zpos plane property
drm/exynos: use generic code for managing zpos plane property
drm: sti: use generic zpos for plane
drm: add generic zpos property
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gpu/kms-properties.csv | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/gpu/kms-properties.csv b/Documentation/gpu/kms-properties.csv index b6fcaf639c045..4c5ce3edcfd92 100644 --- a/Documentation/gpu/kms-properties.csv +++ b/Documentation/gpu/kms-properties.csv @@ -17,6 +17,7 @@ DRM,Generic,“rotation”,BITMASK,"{ 0, ""rotate-0"" }, { 1, ""rotate-90"" }, { ,,“CRTC_H”,RANGE,"Min=0, Max=UINT_MAX",Plane,Scanout CRTC (destination) height (atomic) ,,“FB_ID”,OBJECT,DRM_MODE_OBJECT_FB,Plane,Scanout framebuffer (atomic) ,,“CRTC_ID”,OBJECT,DRM_MODE_OBJECT_CRTC,Plane,CRTC that plane is attached to (atomic) +,,“zpos”,RANGE,"Min=0, Max=UINT_MAX","Plane,Z-order of the plane.Planes with higher Z-order values are displayed on top, planes with identical Z-order values are display in an undefined order" ,DVI-I,“subconnector”,ENUM,"{ “Unknown”, “DVI-D”, “DVI-A” }",Connector,TBD ,,“select subconnector”,ENUM,"{ “Automatic”, “DVI-D”, “DVI-A” }",Connector,TBD ,TV,“subconnector”,ENUM,"{ ""Unknown"", ""Composite"", ""SVIDEO"", ""Component"", ""SCART"" }",Connector,TBD |