Merge tag 'drm-misc-fixes-2018-06-12' of git://anongit.freedesktop.org/drm/drm-misc...

Only a small qxl fix that was queued for v4.17.

Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --cc drivers/gpu/drm/qxl/qxl_display.c
Simple merge