diff options
author | Dave Airlie | 2018-05-15 11:25:07 +0200 |
---|---|---|
committer | Dave Airlie | 2018-05-15 11:25:07 +0200 |
commit | 2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4 (patch) | |
tree | d2d5b989da8bc75e2cec4c76a6acb2ab25008539 /include/uapi/drm/drm_mode.h | |
parent | Merge tag 'drm-amdkfd-next-2018-05-14' of git://people.freedesktop.org/~gabba... (diff) | |
parent | gpu: drm: qxl: Adding new typedef vm_fault_t (diff) | |
download | kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.tar.gz kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.tar.xz kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.zip |
Merge tag 'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v4.18:
UAPI Changes:
- Fix render node number regression from control node removal.
Driver Changes:
- Small header fix for virgl, used by qemu.
- Use vm_fault_t in qxl.
Signed-off-by: Dave Airlie <airlied@redhat.com>
# gpg: Signature made Tue 15 May 2018 06:16:03 PM AEST
# gpg: using RSA key FE558C72A67013C3
# gpg: Can't check signature: public key not found
Link: https://patchwork.freedesktop.org/patch/msgid/e63306b9-67a0-74ab-8883-08b3d9db72d2@mblankhorst.nl
Diffstat (limited to 'include/uapi/drm/drm_mode.h')
-rw-r--r-- | include/uapi/drm/drm_mode.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 50bcf4214ff9..4b3a1bb58e68 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -93,6 +93,8 @@ extern "C" { #define DRM_MODE_PICTURE_ASPECT_NONE 0 #define DRM_MODE_PICTURE_ASPECT_4_3 1 #define DRM_MODE_PICTURE_ASPECT_16_9 2 +#define DRM_MODE_PICTURE_ASPECT_64_27 3 +#define DRM_MODE_PICTURE_ASPECT_256_135 4 /* Aspect ratio flag bitmask (4 bits 22:19) */ #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19) @@ -102,6 +104,10 @@ extern "C" { (DRM_MODE_PICTURE_ASPECT_4_3<<19) #define DRM_MODE_FLAG_PIC_AR_16_9 \ (DRM_MODE_PICTURE_ASPECT_16_9<<19) +#define DRM_MODE_FLAG_PIC_AR_64_27 \ + (DRM_MODE_PICTURE_ASPECT_64_27<<19) +#define DRM_MODE_FLAG_PIC_AR_256_135 \ + (DRM_MODE_PICTURE_ASPECT_256_135<<19) #define DRM_MODE_FLAG_ALL (DRM_MODE_FLAG_PHSYNC | \ DRM_MODE_FLAG_NHSYNC | \ |