virtio-gpu: use no-merge for fill-modes
authorMarc-André Lureau <marcandre.lureau@gmail.com>
Fri, 13 Nov 2015 13:00:40 +0000 (14:00 +0100)
committerDave Airlie <airlied@redhat.com>
Tue, 1 Dec 2015 00:33:35 +0000 (10:33 +1000)
commitd6d38d9d795edc0f31c6c2d4e6743e66564d6c20
tree753180232b3dee47033c7782d6379df6c359f9bb
parentb50a1705b598fa4074a5e5e4f20ca46485d1cd0e
virtio-gpu: use no-merge for fill-modes

Avoid the sticky preferred mode bit by using the no-merge version of the
function (this allows gnome-shell to resize to lower resolutions than
the default resolution)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/virtio/virtgpu_display.c