drm/vmwgfx: Fix screen object page flips for large framebuffers
authorThomas Hellstrom <thellstrom@vmware.com>
Fri, 12 Feb 2016 07:32:08 +0000 (08:32 +0100)
committerThomas Hellstrom <thellstrom@vmware.com>
Mon, 14 Mar 2016 13:56:23 +0000 (14:56 +0100)
For page flips the framebuffer may be much larger than the crtc
scanout area and may be attached to multiple crtcs.
When flipping a crtc, make sure we dirty only that crtc's area of the
framebuffer.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

index b221a8c4028228d31707df756c14507084603f23..29bec974464c91cb0e492cdba4205212a7ad1939 100644 (file)
@@ -663,9 +663,8 @@ static int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer,
                break;
        case vmw_du_screen_object:
                ret = vmw_kms_sou_do_dmabuf_dirty(dev_priv, &vfbd->base,
-                                                 clips, num_clips, increment,
-                                                 true,
-                                                 NULL);
+                                                 clips, NULL, num_clips,
+                                                 increment, true, NULL);
                break;
        case vmw_du_legacy:
                ret = vmw_kms_ldu_do_dmabuf_dirty(dev_priv, &vfbd->base, 0, 0,
index edd81503516dbbda1fab84ecd53ecc0df689f24e..d41928c12a42e26f27453cad349219d53f6662c2 100644 (file)
@@ -287,6 +287,7 @@ int vmw_kms_sou_do_surface_dirty(struct vmw_private *dev_priv,
 int vmw_kms_sou_do_dmabuf_dirty(struct vmw_private *dev_priv,
                                struct vmw_framebuffer *framebuffer,
                                struct drm_clip_rect *clips,
+                               struct drm_vmw_rect *vclips,
                                unsigned num_clips, int increment,
                                bool interruptible,
                                struct vmw_fence_obj **out_fence);
index cbc1fbaa3d8e52e780151b0456b5ef1fc72993c3..c0de3b8d4e5d013b634c082efbad951eb719ef93 100644 (file)
@@ -470,7 +470,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc,
        struct drm_framebuffer *old_fb = crtc->primary->fb;
        struct vmw_framebuffer *vfb = vmw_framebuffer_to_vfb(fb);
        struct vmw_fence_obj *fence = NULL;
-       struct drm_clip_rect clips;
+       struct drm_vmw_rect vclips;
        int ret;
 
        /* require ScreenObject support for page flipping */
@@ -483,17 +483,18 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc,
        crtc->primary->fb = fb;
 
        /* do a full screen dirty update */
-       clips.x1 = clips.y1 = 0;
-       clips.x2 = fb->width;
-       clips.y2 = fb->height;
+       vclips.x = crtc->x;
+       vclips.y = crtc->y;
+       vclips.w = crtc->mode.hdisplay;
+       vclips.h = crtc->mode.vdisplay;
 
        if (vfb->dmabuf)
                ret = vmw_kms_sou_do_dmabuf_dirty(dev_priv, vfb,
-                                                 &clips, 1, 1,
+                                                 NULL, &vclips, 1, 1,
                                                  true, &fence);
        else
                ret = vmw_kms_sou_do_surface_dirty(dev_priv, vfb,
-                                                  &clips, NULL, NULL,
+                                                  NULL, &vclips, NULL,
                                                   0, 0, 1, 1, &fence);
 
 
@@ -919,6 +920,8 @@ static void vmw_sou_dmabuf_clip(struct vmw_kms_dirty *dirty)
  * @dev_priv: Pointer to the device private structure.
  * @framebuffer: Pointer to the dma-buffer backed framebuffer.
  * @clips: Array of clip rects.
+ * @vclips: Alternate array of clip rects. Either @clips or @vclips must
+ * be NULL.
  * @num_clips: Number of clip rects in @clips.
  * @increment: Increment to use when looping over @clips.
  * @interruptible: Whether to perform waits interruptible if possible.
@@ -932,6 +935,7 @@ static void vmw_sou_dmabuf_clip(struct vmw_kms_dirty *dirty)
 int vmw_kms_sou_do_dmabuf_dirty(struct vmw_private *dev_priv,
                                struct vmw_framebuffer *framebuffer,
                                struct drm_clip_rect *clips,
+                               struct drm_vmw_rect *vclips,
                                unsigned num_clips, int increment,
                                bool interruptible,
                                struct vmw_fence_obj **out_fence)
@@ -955,7 +959,7 @@ int vmw_kms_sou_do_dmabuf_dirty(struct vmw_private *dev_priv,
        dirty.clip = vmw_sou_dmabuf_clip;
        dirty.fifo_reserve_size = sizeof(struct vmw_kms_sou_dmabuf_blit) *
                num_clips;
-       ret = vmw_kms_helper_dirty(dev_priv, framebuffer, clips, NULL,
+       ret = vmw_kms_helper_dirty(dev_priv, framebuffer, clips, vclips,
                                   0, 0, num_clips, increment, &dirty);
        vmw_kms_helper_buffer_finish(dev_priv, NULL, buf, out_fence, NULL);