diff options
| author | Matt Roper <matthew.d.roper@intel.com> | 2014-04-01 15:22:42 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-04-01 20:18:29 -0400 |
| commit | 681e7ec730444b616a1e7278a22a2691094a64e6 (patch) | |
| tree | 950dde2a3943854b0910c684689315febabbf817 /include | |
| parent | 780f59847193eac97901ab6e74683956b4b0cf20 (diff) | |
| download | op-kernel-dev-681e7ec730444b616a1e7278a22a2691094a64e6.zip op-kernel-dev-681e7ec730444b616a1e7278a22a2691094a64e6.tar.gz | |
drm: Allow userspace to ask for universal plane list (v2)
Userspace clients which wish to receive all DRM planes (primary and
cursor planes in addition to the traditional overlay planes) may set the
DRM_CLIENT_CAP_UNIVERSAL_PLANES capability.
v2: Hide behind drm.universal_planes module option [suggested by
Daniel Vetter]
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drmP.h | 6 | ||||
| -rw-r--r-- | include/uapi/drm/drm.h | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e97fc99..a7c2a86 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -409,6 +409,11 @@ struct drm_file { unsigned is_master :1; /* true when the client has asked us to expose stereo 3D mode flags */ unsigned stereo_allowed :1; + /* + * true if client understands CRTC primary planes and cursor planes + * in the plane list + */ + unsigned universal_planes:1; struct pid *pid; kuid_t uid; @@ -1409,6 +1414,7 @@ extern void drm_put_dev(struct drm_device *dev); extern void drm_unplug_dev(struct drm_device *dev); extern unsigned int drm_debug; extern unsigned int drm_rnodes; +extern unsigned int drm_universal_planes; extern unsigned int drm_vblank_offdelay; extern unsigned int drm_timestamp_precision; diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index b06c8ed..6e4952b 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -637,6 +637,14 @@ struct drm_get_cap { */ #define DRM_CLIENT_CAP_STEREO_3D 1 +/** + * DRM_CLIENT_CAP_UNIVERSAL_PLANES + * + * If set to 1, the DRM core will expose all planes (overlay, primary, and + * cursor) to userspace. + */ +#define DRM_CLIENT_CAP_UNIVERSAL_PLANES 2 + /** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */ struct drm_set_client_cap { __u64 capability; |
