]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/vmwgfx: Use the new interface for SOU plane update
authorDeepak Rawat <drawat@vmware.com>
Fri, 21 Sep 2018 21:07:33 +0000 (14:07 -0700)
committerThomas Hellstrom <thellstrom@vmware.com>
Wed, 5 Dec 2018 09:00:41 +0000 (10:00 +0100)
With new interface to do plane update on SOU available, use that instead
of old kms_dirty.

Signed-off-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

index 670f4ac5cdd3789e31abcf1813f73207b6141571..0bca79caf96a89bb9ec6b0ea1d2e7de2a3cc0cd9 100644 (file)
@@ -774,21 +774,14 @@ vmw_sou_primary_plane_atomic_update(struct drm_plane *plane,
                struct vmw_private *dev_priv = vmw_priv(crtc->dev);
                struct vmw_framebuffer *vfb =
                        vmw_framebuffer_to_vfb(plane->state->fb);
-               struct drm_vmw_rect vclips;
-
-               vclips.x = crtc->x;
-               vclips.y = crtc->y;
-               vclips.w = crtc->mode.hdisplay;
-               vclips.h = crtc->mode.vdisplay;
 
                if (vfb->bo)
-                       ret = vmw_kms_sou_do_bo_dirty(dev_priv, vfb, NULL,
-                                                     &vclips, 1, 1, true,
-                                                     &fence, crtc);
+                       ret = vmw_sou_plane_update_bo(dev_priv, plane,
+                                                     old_state, vfb, &fence);
                else
-                       ret = vmw_kms_sou_do_surface_dirty(dev_priv, vfb, NULL,
-                                                          &vclips, NULL, 0, 0,
-                                                          1, 1, &fence, crtc);
+                       ret = vmw_sou_plane_update_surface(dev_priv, plane,
+                                                          old_state, vfb,
+                                                          &fence);
 
                /*
                 * We cannot really fail this function, so if we do, then output