Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Gerd Hoffmann <kraxel@redhat.com>
To:     dri-devel@lists.freedesktop.org
Cc:     gurchetansingh@chromium.org, Gerd Hoffmann <kraxel@redhat.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        virtualization@lists.linux-foundation.org (open list:VIRTIO GPU DRIVER),
        linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 3/3] virtio-gpu: use damage info for display updates.
Date:   Wed, 11 Dec 2019 09:42:16 +0100
Message-Id: <20191211084216.25405-4-kraxel@redhat.com>
In-Reply-To: <20191211084216.25405-1-kraxel@redhat.com>
References: <20191211084216.25405-1-kraxel@redhat.com>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 drivers/gpu/drm/virtio/virtgpu_plane.c | 41 +++++++++++++++-----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virti=
o/virtgpu_plane.c
index 2e0d14e005db..1a0fbbb91ec7 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -24,6 +24,7 @@
  */
=20
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_damage_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
=20
@@ -103,22 +104,26 @@ static int virtio_gpu_plane_atomic_check(struct drm_p=
lane *plane,
 }
=20
 static void virtio_gpu_update_dumb_bo(struct virtio_gpu_device *vgdev,
-=09=09=09=09      struct virtio_gpu_object *bo,
-=09=09=09=09      struct drm_plane_state *state)
+=09=09=09=09      struct drm_plane_state *state,
+=09=09=09=09      struct drm_rect *rect)
 {
+=09struct virtio_gpu_object *bo =3D
+=09=09gem_to_virtio_gpu_obj(state->fb->obj[0]);
 =09struct virtio_gpu_object_array *objs;
+=09uint32_t w =3D rect->x2 - rect->x1;
+=09uint32_t h =3D rect->y2 - rect->y1;
+=09uint32_t x =3D rect->x1 + (state->src_x >> 16);
+=09uint32_t y =3D rect->y1 + (state->src_y >> 16);
+=09uint32_t off =3D x * state->fb->format->cpp[0] +
+=09=09y * state->fb->pitches[0];
=20
 =09objs =3D virtio_gpu_array_alloc(1);
 =09if (!objs)
 =09=09return;
 =09virtio_gpu_array_add_obj(objs, &bo->base.base);
-=09virtio_gpu_cmd_transfer_to_host_2d
-=09=09(vgdev, 0,
-=09=09 state->src_w >> 16,
-=09=09 state->src_h >> 16,
-=09=09 state->src_x >> 16,
-=09=09 state->src_y >> 16,
-=09=09 objs, NULL);
+
+=09virtio_gpu_cmd_transfer_to_host_2d(vgdev, off, w, h, x, y,
+=09=09=09=09=09   objs, NULL);
 }
=20
 static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
@@ -127,8 +132,8 @@ static void virtio_gpu_primary_plane_update(struct drm_=
plane *plane,
 =09struct drm_device *dev =3D plane->dev;
 =09struct virtio_gpu_device *vgdev =3D dev->dev_private;
 =09struct virtio_gpu_output *output =3D NULL;
-=09struct virtio_gpu_framebuffer *vgfb;
 =09struct virtio_gpu_object *bo;
+=09struct drm_rect rect;
=20
 =09if (plane->state->crtc)
 =09=09output =3D drm_crtc_to_virtio_gpu_output(plane->state->crtc);
@@ -146,12 +151,14 @@ static void virtio_gpu_primary_plane_update(struct dr=
m_plane *plane,
 =09=09return;
 =09}
=20
+=09if (!drm_atomic_helper_damage_merged(old_state, plane->state, &rect))
+=09=09return;
+
 =09virtio_gpu_disable_notify(vgdev);
=20
-=09vgfb =3D to_virtio_gpu_framebuffer(plane->state->fb);
-=09bo =3D gem_to_virtio_gpu_obj(vgfb->base.obj[0]);
+=09bo =3D gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
 =09if (bo->dumb)
-=09=09virtio_gpu_update_dumb_bo(vgdev, bo, plane->state);
+=09=09virtio_gpu_update_dumb_bo(vgdev, plane->state, &rect);
=20
 =09if (plane->state->fb !=3D old_state->fb) {
 =09=09DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n",
@@ -171,10 +178,10 @@ static void virtio_gpu_primary_plane_update(struct dr=
m_plane *plane,
 =09}
=20
 =09virtio_gpu_cmd_resource_flush(vgdev, bo->hw_res_handle,
-=09=09=09=09      plane->state->src_x >> 16,
-=09=09=09=09      plane->state->src_y >> 16,
-=09=09=09=09      plane->state->src_w >> 16,
-=09=09=09=09      plane->state->src_h >> 16);
+=09=09=09=09      (plane->state->src_x >> 16) + rect.x1,
+=09=09=09=09      (plane->state->src_y >> 16) + rect.y1,
+=09=09=09=09      rect.x2 - rect.x1,
+=09=09=09=09      rect.y2 - rect.y1);
=20
 =09virtio_gpu_enable_notify(vgdev);
 }
--=20
2.18.1