diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-15 19:25:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-15 19:25:07 +1000 |
| commit | 2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4 (patch) | |
| tree | d2d5b989da8bc75e2cec4c76a6acb2ab25008539 /drivers/video/hdmi.c | |
| parent | c76f0b2cc2f1be1a8a20f0fe2c0f30919bc559fb (diff) | |
| parent | 68266f1c08db731fa7c3a0903bf890fc76ce9345 (diff) | |
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 'drivers/video/hdmi.c')
| -rw-r--r-- | drivers/video/hdmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 111a0ab6280a..38716eb50408 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c @@ -93,6 +93,9 @@ ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer, if (size < length) return -ENOSPC; + if (frame->picture_aspect > HDMI_PICTURE_ASPECT_16_9) + return -EINVAL; + memset(buffer, 0, size); ptr[0] = frame->type; |