Gerd Hoffmann
2019-Dec-11 08:42 UTC
[PATCH 3/3] virtio-gpu: use damage info for display updates.
Signed-off-by: Gerd Hoffmann <kraxel at 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/virtio/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 @@
*/
#include <drm/drm_atomic_helper.h>
+#include <drm/drm_damage_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
@@ -103,22 +104,26 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane
*plane,
}
static void virtio_gpu_update_dumb_bo(struct virtio_gpu_device *vgdev,
- struct virtio_gpu_object *bo,
- struct drm_plane_state *state)
+ struct drm_plane_state *state,
+ struct drm_rect *rect)
{
+ struct virtio_gpu_object *bo +
gem_to_virtio_gpu_obj(state->fb->obj[0]);
struct virtio_gpu_object_array *objs;
+ uint32_t w = rect->x2 - rect->x1;
+ uint32_t h = rect->y2 - rect->y1;
+ uint32_t x = rect->x1 + (state->src_x >> 16);
+ uint32_t y = rect->y1 + (state->src_y >> 16);
+ uint32_t off = x * state->fb->format->cpp[0] +
+ y * state->fb->pitches[0];
objs = virtio_gpu_array_alloc(1);
if (!objs)
return;
virtio_gpu_array_add_obj(objs, &bo->base.base);
- virtio_gpu_cmd_transfer_to_host_2d
- (vgdev, 0,
- state->src_w >> 16,
- state->src_h >> 16,
- state->src_x >> 16,
- state->src_y >> 16,
- objs, NULL);
+
+ virtio_gpu_cmd_transfer_to_host_2d(vgdev, off, w, h, x, y,
+ objs, NULL);
}
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,
struct drm_device *dev = plane->dev;
struct virtio_gpu_device *vgdev = dev->dev_private;
struct virtio_gpu_output *output = NULL;
- struct virtio_gpu_framebuffer *vgfb;
struct virtio_gpu_object *bo;
+ struct drm_rect rect;
if (plane->state->crtc)
output = drm_crtc_to_virtio_gpu_output(plane->state->crtc);
@@ -146,12 +151,14 @@ static void virtio_gpu_primary_plane_update(struct
drm_plane *plane,
return;
}
+ if (!drm_atomic_helper_damage_merged(old_state, plane->state, &rect))
+ return;
+
virtio_gpu_disable_notify(vgdev);
- vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
- bo = gem_to_virtio_gpu_obj(vgfb->base.obj[0]);
+ bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
if (bo->dumb)
- virtio_gpu_update_dumb_bo(vgdev, bo, plane->state);
+ virtio_gpu_update_dumb_bo(vgdev, plane->state, &rect);
if (plane->state->fb != old_state->fb) {
DRM_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
drm_plane *plane,
}
virtio_gpu_cmd_resource_flush(vgdev, bo->hw_res_handle,
- plane->state->src_x >> 16,
- plane->state->src_y >> 16,
- plane->state->src_w >> 16,
- plane->state->src_h >> 16);
+ (plane->state->src_x >> 16) + rect.x1,
+ (plane->state->src_y >> 16) + rect.y1,
+ rect.x2 - rect.x1,
+ rect.y2 - rect.y1);
virtio_gpu_enable_notify(vgdev);
}
--
2.18.1
Chia-I Wu
2019-Dec-11 19:03 UTC
[PATCH 3/3] virtio-gpu: use damage info for display updates.
On Wed, Dec 11, 2019 at 12:42 AM Gerd Hoffmann <kraxel at redhat.com> wrote:> > Signed-off-by: Gerd Hoffmann <kraxel at 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/virtio/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 @@ > */ > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_damage_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_plane_helper.h> > > @@ -103,22 +104,26 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane, > } > > static void virtio_gpu_update_dumb_bo(struct virtio_gpu_device *vgdev, > - struct virtio_gpu_object *bo, > - struct drm_plane_state *state) > + struct drm_plane_state *state, > + struct drm_rect *rect) > { > + struct virtio_gpu_object *bo > + gem_to_virtio_gpu_obj(state->fb->obj[0]); > struct virtio_gpu_object_array *objs; > + uint32_t w = rect->x2 - rect->x1; > + uint32_t h = rect->y2 - rect->y1; > + uint32_t x = rect->x1 + (state->src_x >> 16); > + uint32_t y = rect->y1 + (state->src_y >> 16); > + uint32_t off = x * state->fb->format->cpp[0] + > + y * state->fb->pitches[0]; > > objs = virtio_gpu_array_alloc(1); > if (!objs) > return; > virtio_gpu_array_add_obj(objs, &bo->base.base); > - virtio_gpu_cmd_transfer_to_host_2d > - (vgdev, 0, > - state->src_w >> 16, > - state->src_h >> 16, > - state->src_x >> 16, > - state->src_y >> 16, > - objs, NULL); > + > + virtio_gpu_cmd_transfer_to_host_2d(vgdev, off, w, h, x, y, > + objs, NULL); > } > > 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, > struct drm_device *dev = plane->dev; > struct virtio_gpu_device *vgdev = dev->dev_private; > struct virtio_gpu_output *output = NULL; > - struct virtio_gpu_framebuffer *vgfb; > struct virtio_gpu_object *bo; > + struct drm_rect rect; > > if (plane->state->crtc) > output = drm_crtc_to_virtio_gpu_output(plane->state->crtc); > @@ -146,12 +151,14 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, > return; > } > > + if (!drm_atomic_helper_damage_merged(old_state, plane->state, &rect)) > + return; > + > virtio_gpu_disable_notify(vgdev); > > - vgfb = to_virtio_gpu_framebuffer(plane->state->fb); > - bo = gem_to_virtio_gpu_obj(vgfb->base.obj[0]); > + bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]); > if (bo->dumb) > - virtio_gpu_update_dumb_bo(vgdev, bo, plane->state); > + virtio_gpu_update_dumb_bo(vgdev, plane->state, &rect); > > if (plane->state->fb != old_state->fb) { > DRM_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 drm_plane *plane, > } > > virtio_gpu_cmd_resource_flush(vgdev, bo->hw_res_handle, > - plane->state->src_x >> 16, > - plane->state->src_y >> 16, > - plane->state->src_w >> 16, > - plane->state->src_h >> 16); > + (plane->state->src_x >> 16) + rect.x1, > + (plane->state->src_y >> 16) + rect.y1,Digging into drm_atomic_helper_damage_merged, it seems rect uses absolute values and is not relative to src_{x,y}.> + rect.x2 - rect.x1, > + rect.y2 - rect.y1); > > virtio_gpu_enable_notify(vgdev); > } > -- > 2.18.1 > > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reasonably Related Threads
- [PATCH 1/3] drm/virtio: skip set_scanout if framebuffer didn't change
- [PATCH] drm/virtio: move byteorder handling into virtio_gpu_cmd_transfer_to_host_2d function
- [PATCH v2 3/3] virtio-gpu: use damage info for display updates.
- [PATCH] drm/virtio: fix unblank
- [PATCH] drm/virtio: fix unblank