aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/vboxvideo
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2018-09-11 09:15:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-18 13:22:59 +0200
commit3c94952c38cefce6fde11b0cb44d7f961237faa8 (patch)
tree83ef9158e012b6a8c2b4508b37aaad5be519c0ca /drivers/staging/vboxvideo
parenta5aca20574693dac83dfcc98b08a41251b97edfb (diff)
staging: vboxvideo: Skip currrent crtc when updating crtcs
In vbox_crtc_set_base_and_mode() we update all the crtcs when the single_framebuffer setting changes, including the one on which vbox_crtc_set_base_and_mode() was called, so we end up doing vbox_do_modeset() on it twice. This commit skips the crtc on which we are updating in the loop to update the other crtcs. This commit also removes the vbox_set_view() call from the loop, vbox_set_view() does not depend on the single_framebuffer setting and it was being called on the passed in crtc parameter and not on the crtci local iterator value (typo), so it was a no-op already. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vboxvideo')
-rw-r--r--drivers/staging/vboxvideo/vbox_mode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index 47de1364ec4d..e7d70ced5bfd 100644
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -287,7 +287,8 @@ static int vbox_crtc_set_base_and_mode(struct drm_crtc *crtc,
list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
head) {
- vbox_set_view(crtc);
+ if (crtci == crtc)
+ continue;
vbox_do_modeset(crtci, &crtci->mode);
}
}