diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-11-13 14:00:40 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-01 01:33:35 +0100 |
| commit | d6d38d9d795edc0f31c6c2d4e6743e66564d6c20 (patch) | |
| tree | 753180232b3dee47033c7782d6379df6c359f9bb /drivers/gpu/drm/virtio | |
| parent | Merge tag 'drm-intel-fixes-2015-11-30' of git://anongit.freedesktop.org/drm-i... (diff) | |
| download | linux-d6d38d9d795edc0f31c6c2d4e6743e66564d6c20.tar.xz linux-d6d38d9d795edc0f31c6c2d4e6743e66564d6c20.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/virtio')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index f545913a56c7..578fe0a9324c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -412,7 +412,7 @@ static const struct drm_connector_funcs virtio_gpu_connector_funcs = { .save = virtio_gpu_conn_save, .restore = virtio_gpu_conn_restore, .detect = virtio_gpu_conn_detect, - .fill_modes = drm_helper_probe_single_connector_modes, + .fill_modes = drm_helper_probe_single_connector_modes_nomerge, .destroy = virtio_gpu_conn_destroy, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, |