drm/virtio: various cleanups
Subsystems (4)
Gerd Hoffmann
maintainerv2 cover drm/virtio: various cleanups
Little patch series doing some cleanups in the virtio driver. Patches #1 + #2 have been on the list before as single patches, includes here again for patch dependency reasons.
v2:
- fix sparse errors.
- drop merged patches (#1 + #2).
please review,
Gerd
Gerd Hoffmann (3):
drm/virtio: fix byteorder handling in
virtio_gpu_cmd_transfer_{from,to}_host_3d functions
drm/virtio: Simplify virtio_gpu_primary_plane_update workflow. drm/virtio: factor out virtio_gpu_update_dumb_bo
drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 ++------ drivers/gpu/drm/virtio/virtgpu_plane.c | 70 +++++++++++++++----------- drivers/gpu/drm/virtio/virtgpu_vq.c | 19 +++++-- 4 files changed, 61 insertions(+), 55 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v2 1/3 drm/virtio: fix byteorder handling in virtio_gpu_cmd_transfer_{from,to}_host_3d functions
Be consistent with the rest of the code base.
No functional change.
v2:
- fix sparse warnings for virtio_gpu_cmd_transfer_to_host_2d call.
- move convert_to_hw_box helper function.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +++-- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 +++------------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 19 +++++++++++++++---- 3 files changed, 21 insertions(+), 25 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -2
@@ -38,6 +38,7 @@#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> +#include <drm/virtgpu_drm.h> #define DRIVER_NAME "virtio_gpu"#define DRIVER_DESC "virtio GPU"
@@ -312,13 +313,13 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void
drivers/gpu/drm/virtio/virtgpu_ioctl.c +3 -19
@@ -33,17 +33,6 @@#include "virtgpu_drv.h" -static void convert_to_hw_box (struct virtio_gpu_box *dst, -const struct drm_virtgpu_3d_box *src) -{ - dst->x =cpu_to_le32 (src->x); - dst->y =cpu_to_le32 (src->y); - dst->z =cpu_to_le32 (src->z); - dst->w =cpu_to_le32 (src->w); - dst->h =cpu_to_le32 (src->h); - dst->d =cpu_to_le32 (src->d); -} -static int virtio_gpu_map_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -304,7 +293,6 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,struct virtio_gpu_fence *fence;int ret;u32 offset = args->offset; -struct virtio_gpu_box box;if (vgdev->has_virgl_3d == false)return -ENOSYS ;
@@ -317,8 +305,6 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,if (ret !=0 ) goto err_put_free; -convert_to_hw_box (&box, &args->box); - fence =virtio_gpu_fence_alloc (vgdev);if (!fence) { ret = -ENOMEM ;
@@ -326,7 +312,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, }virtio_gpu_cmd_transfer_from_host_3d (vgdev, vfpriv->ctx_id, offset, args->level, - &box, objs, fence); + &args->box, objs, fence);dma_fence_put (&fence->f);return 0 ;
@@ -345,7 +331,6 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,struct drm_virtgpu_3d_transfer_to_host *args = data;struct virtio_gpu_object_array *objs;struct virtio_gpu_fence *fence; -struct virtio_gpu_box box;int ret;u32 offset = args->offset;
@@ -353,11 +338,10 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,if (objs ==NULL )return -ENOENT ; -convert_to_hw_box (&box, &args->box);if (!vgdev->has_virgl_3d) {virtio_gpu_cmd_transfer_to_host_2d (vgdev, offset, - box.w, box.h, box.x, box.y, + args->box.w, args->box.h, args->box.x, args->box.y, objs,NULL ); }else { ret =virtio_gpu_array_lock_resv (objs);
@@ -372,7 +356,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,virtio_gpu_cmd_transfer_to_host_3d (vgdev, vfpriv ? vfpriv->ctx_id :0 , offset, - args->level, &box, objs, fence); + args->level, &args->box, objs, fence);dma_fence_put (&fence->f); }return 0 ;
drivers/gpu/drm/virtio/virtgpu_vq.c +15 -4
@@ -40,6 +40,17 @@ + MAX_INLINE_CMD_SIZE \ + MAX_INLINE_RESP_SIZE) +static void convert_to_hw_box (struct virtio_gpu_box *dst, +const struct drm_virtgpu_3d_box *src) +{ + dst->x =cpu_to_le32 (src->x); + dst->y =cpu_to_le32 (src->y); + dst->z =cpu_to_le32 (src->z); + dst->w =cpu_to_le32 (src->w); + dst->h =cpu_to_le32 (src->h); + dst->d =cpu_to_le32 (src->d); +} +void virtio_gpu_ctrl_ack (struct virtqueue *vq) {struct drm_device *dev = vq->vdev->priv;
@@ -965,7 +976,7 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {
@@ -987,7 +998,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); - cmd_p->box = *box; +convert_to_hw_box (&cmd_p->box, box); cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
@@ -997,7 +1008,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {
@@ -1013,7 +1024,7 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); - cmd_p->box = *box; +convert_to_hw_box (&cmd_p->box, box); cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v2 1/3 drm/virtio: fix byteorder handling in virtio_gpu_cmd_transfer_{from, to}_host_3d functions
In reply to Gerd HoffmannBe consistent with the rest of the code base.
No functional change.
v2:
- fix sparse warnings for virtio_gpu_cmd_transfer_to_host_2d call.
- move convert_to_hw_box helper function.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +++-- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 +++------------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 19 +++++++++++++++---- 3 files changed, 21 insertions(+), 25 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -2
@@ -38,6 +38,7 @@#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> +#include <drm/virtgpu_drm.h> #define DRIVER_NAME "virtio_gpu"#define DRIVER_DESC "virtio GPU"
@@ -312,13 +313,13 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void
drivers/gpu/drm/virtio/virtgpu_ioctl.c +3 -19
@@ -33,17 +33,6 @@#include "virtgpu_drv.h" -static void convert_to_hw_box (struct virtio_gpu_box *dst, -const struct drm_virtgpu_3d_box *src) -{ - dst->x =cpu_to_le32 (src->x); - dst->y =cpu_to_le32 (src->y); - dst->z =cpu_to_le32 (src->z); - dst->w =cpu_to_le32 (src->w); - dst->h =cpu_to_le32 (src->h); - dst->d =cpu_to_le32 (src->d); -} -static int virtio_gpu_map_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -304,7 +293,6 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,struct virtio_gpu_fence *fence;int ret;u32 offset = args->offset; -struct virtio_gpu_box box;if (vgdev->has_virgl_3d == false)return -ENOSYS ;
@@ -317,8 +305,6 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,if (ret !=0 ) goto err_put_free; -convert_to_hw_box (&box, &args->box); - fence =virtio_gpu_fence_alloc (vgdev);if (!fence) { ret = -ENOMEM ;
@@ -326,7 +312,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, }virtio_gpu_cmd_transfer_from_host_3d (vgdev, vfpriv->ctx_id, offset, args->level, - &box, objs, fence); + &args->box, objs, fence);dma_fence_put (&fence->f);return 0 ;
@@ -345,7 +331,6 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,struct drm_virtgpu_3d_transfer_to_host *args = data;struct virtio_gpu_object_array *objs;struct virtio_gpu_fence *fence; -struct virtio_gpu_box box;int ret;u32 offset = args->offset;
@@ -353,11 +338,10 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,if (objs ==NULL )return -ENOENT ; -convert_to_hw_box (&box, &args->box);if (!vgdev->has_virgl_3d) {virtio_gpu_cmd_transfer_to_host_2d (vgdev, offset, - box.w, box.h, box.x, box.y, + args->box.w, args->box.h, args->box.x, args->box.y, objs,NULL ); }else { ret =virtio_gpu_array_lock_resv (objs);
@@ -372,7 +356,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,virtio_gpu_cmd_transfer_to_host_3d (vgdev, vfpriv ? vfpriv->ctx_id :0 , offset, - args->level, &box, objs, fence); + args->level, &args->box, objs, fence);dma_fence_put (&fence->f); }return 0 ;
drivers/gpu/drm/virtio/virtgpu_vq.c +15 -4
@@ -40,6 +40,17 @@ + MAX_INLINE_CMD_SIZE \ + MAX_INLINE_RESP_SIZE) +static void convert_to_hw_box (struct virtio_gpu_box *dst, +const struct drm_virtgpu_3d_box *src) +{ + dst->x =cpu_to_le32 (src->x); + dst->y =cpu_to_le32 (src->y); + dst->z =cpu_to_le32 (src->z); + dst->w =cpu_to_le32 (src->w); + dst->h =cpu_to_le32 (src->h); + dst->d =cpu_to_le32 (src->d); +} +void virtio_gpu_ctrl_ack (struct virtqueue *vq) {struct drm_device *dev = vq->vdev->priv;
@@ -965,7 +976,7 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {
@@ -987,7 +998,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); - cmd_p->box = *box; +convert_to_hw_box (&cmd_p->box, box); cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
@@ -997,7 +1008,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {
@@ -1013,7 +1024,7 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); - cmd_p->box = *box; +convert_to_hw_box (&cmd_p->box, box); cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v2 2/3 drm/virtio: Simplify virtio_gpu_primary_plane_update workflow.
In reply to Gerd HoffmannReturn early for the no framebuffer (or disabled output) case. Results in a simpler code flow for the remaining cases. No functional change.
--- drivers/gpu/drm/virtio/virtgpu_plane.c | 62 ++++++++++++++------------ 1 file changed, 33 insertions(+), 29 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +33 -29
@@ -110,7 +110,6 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,struct virtio_gpu_output *output =NULL ;struct virtio_gpu_framebuffer *vgfb;struct virtio_gpu_object *bo; -uint32_t handle;if (plane->state->crtc) output =drm_crtc_to_virtio_gpu_output (plane->state->crtc);
@@ -119,47 +118,52 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,if (WARN_ON (!output))return ; -if (plane->state->fb && output->enabled) { - vgfb =to_virtio_gpu_framebuffer (plane->state->fb); - bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); - handle = bo->hw_res_handle; -if (bo->dumb) { -struct virtio_gpu_object_array *objs; +if (!plane->state->fb || !output->enabled) { +DRM_DEBUG ("nofb\n" ); +virtio_gpu_cmd_set_scanout (vgdev, output->index,0 , + plane->state->src_w >>16 , + plane->state->src_h >>16 , +0 ,0 ); +return ; + } + + vgfb =to_virtio_gpu_framebuffer (plane->state->fb); + bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); +if (bo->dumb) { +struct virtio_gpu_object_array *objs; - objs =virtio_gpu_array_alloc (1 ); -if (!objs) -return ; -virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]); -virtio_gpu_cmd_transfer_to_host_2d - (vgdev,0 , - plane->state->src_w >>16 , - plane->state->src_h >>16 , - plane->state->src_x >>16 , - plane->state->src_y >>16 , - objs,NULL ); - } - }else { - handle =0 ; + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return ; +virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]); +virtio_gpu_cmd_transfer_to_host_2d + (vgdev,0 , + plane->state->src_w >>16 , + plane->state->src_h >>16 , + plane->state->src_x >>16 , + plane->state->src_y >>16 , + objs,NULL ); } -DRM_DEBUG ("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n" , handle, +DRM_DEBUG ("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n" , + bo->hw_res_handle, plane->state->crtc_w, plane->state->crtc_h, plane->state->crtc_x, plane->state->crtc_y, plane->state->src_w >>16 , plane->state->src_h >>16 , plane->state->src_x >>16 , plane->state->src_y >>16 ); -virtio_gpu_cmd_set_scanout (vgdev, output->index, handle, +virtio_gpu_cmd_set_scanout (vgdev, output->index, + bo->hw_res_handle, plane->state->src_w >>16 , plane->state->src_h >>16 , plane->state->src_x >>16 , plane->state->src_y >>16 ); -if (handle) -virtio_gpu_cmd_resource_flush (vgdev, handle, - plane->state->src_x >>16 , - plane->state->src_y >>16 , - plane->state->src_w >>16 , - plane->state->src_h >>16 ); +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 ); } static int virtio_gpu_cursor_prepare_fb(struct drm_plane *plane,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v2 2/3 drm/virtio: Simplify virtio_gpu_primary_plane_update workflow.
In reply to Gerd HoffmannReturn early for the no framebuffer (or disabled output) case. Results in a simpler code flow for the remaining cases. No functional change.
--- drivers/gpu/drm/virtio/virtgpu_plane.c | 62 ++++++++++++++------------ 1 file changed, 33 insertions(+), 29 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +33 -29
@@ -110,7 +110,6 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,struct virtio_gpu_output *output =NULL ;struct virtio_gpu_framebuffer *vgfb;struct virtio_gpu_object *bo; -uint32_t handle;if (plane->state->crtc) output =drm_crtc_to_virtio_gpu_output (plane->state->crtc);
@@ -119,47 +118,52 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,if (WARN_ON (!output))return ; -if (plane->state->fb && output->enabled) { - vgfb =to_virtio_gpu_framebuffer (plane->state->fb); - bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); - handle = bo->hw_res_handle; -if (bo->dumb) { -struct virtio_gpu_object_array *objs; +if (!plane->state->fb || !output->enabled) { +DRM_DEBUG ("nofb\n" ); +virtio_gpu_cmd_set_scanout (vgdev, output->index,0 , + plane->state->src_w >>16 , + plane->state->src_h >>16 , +0 ,0 ); +return ; + } + + vgfb =to_virtio_gpu_framebuffer (plane->state->fb); + bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); +if (bo->dumb) { +struct virtio_gpu_object_array *objs; - objs =virtio_gpu_array_alloc (1 ); -if (!objs) -return ; -virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]); -virtio_gpu_cmd_transfer_to_host_2d - (vgdev,0 , - plane->state->src_w >>16 , - plane->state->src_h >>16 , - plane->state->src_x >>16 , - plane->state->src_y >>16 , - objs,NULL ); - } - }else { - handle =0 ; + objs =virtio_gpu_array_alloc (1 ); +if (!objs) +return ; +virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]); +virtio_gpu_cmd_transfer_to_host_2d + (vgdev,0 , + plane->state->src_w >>16 , + plane->state->src_h >>16 , + plane->state->src_x >>16 , + plane->state->src_y >>16 , + objs,NULL ); } -DRM_DEBUG ("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n" , handle, +DRM_DEBUG ("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n" , + bo->hw_res_handle, plane->state->crtc_w, plane->state->crtc_h, plane->state->crtc_x, plane->state->crtc_y, plane->state->src_w >>16 , plane->state->src_h >>16 , plane->state->src_x >>16 , plane->state->src_y >>16 ); -virtio_gpu_cmd_set_scanout (vgdev, output->index, handle, +virtio_gpu_cmd_set_scanout (vgdev, output->index, + bo->hw_res_handle, plane->state->src_w >>16 , plane->state->src_h >>16 , plane->state->src_x >>16 , plane->state->src_y >>16 ); -if (handle) -virtio_gpu_cmd_resource_flush (vgdev, handle, - plane->state->src_x >>16 , - plane->state->src_y >>16 , - plane->state->src_w >>16 , - plane->state->src_h >>16 ); +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 ); } static int virtio_gpu_cursor_prepare_fb(struct drm_plane *plane,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v2 3/3 drm/virtio: factor out virtio_gpu_update_dumb_bo
In reply to Gerd HoffmannNo functional change.
--- drivers/gpu/drm/virtio/virtgpu_plane.c | 36 +++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +21 -15
@@ -102,6 +102,25 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane,return ret; } +static void virtio_gpu_update_dumb_bo (struct virtio_gpu_device *vgdev, +struct virtio_gpu_object *bo, +struct drm_plane_state *state) +{ +struct virtio_gpu_object_array *objs; + + 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 ); +} +static void virtio_gpu_primary_plane_update (struct drm_plane *plane,struct drm_plane_state *old_state) {
@@ -129,21 +148,8 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, vgfb =to_virtio_gpu_framebuffer (plane->state->fb); bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); -if (bo->dumb) { -struct virtio_gpu_object_array *objs; - - objs =virtio_gpu_array_alloc (1 ); -if (!objs) -return ; -virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]); -virtio_gpu_cmd_transfer_to_host_2d - (vgdev,0 , - plane->state->src_w >>16 , - plane->state->src_h >>16 , - plane->state->src_x >>16 , - plane->state->src_y >>16 , - objs,NULL ); - } +if (bo->dumb) +virtio_gpu_update_dumb_bo (vgdev, bo, plane->state); DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", bo->hw_res_handle,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v2 3/3 drm/virtio: factor out virtio_gpu_update_dumb_bo
In reply to Gerd HoffmannNo functional change.
--- drivers/gpu/drm/virtio/virtgpu_plane.c | 36 +++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-)
drivers/gpu/drm/virtio/virtgpu_plane.c +21 -15
@@ -102,6 +102,25 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane,return ret; } +static void virtio_gpu_update_dumb_bo (struct virtio_gpu_device *vgdev, +struct virtio_gpu_object *bo, +struct drm_plane_state *state) +{ +struct virtio_gpu_object_array *objs; + + 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 ); +} +static void virtio_gpu_primary_plane_update (struct drm_plane *plane,struct drm_plane_state *old_state) {
@@ -129,21 +148,8 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, vgfb =to_virtio_gpu_framebuffer (plane->state->fb); bo =gem_to_virtio_gpu_obj (vgfb->base.obj[0 ]); -if (bo->dumb) { -struct virtio_gpu_object_array *objs; - - objs =virtio_gpu_array_alloc (1 ); -if (!objs) -return ; -virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]); -virtio_gpu_cmd_transfer_to_host_2d - (vgdev,0 , - plane->state->src_w >>16 , - plane->state->src_h >>16 , - plane->state->src_x >>16 , - plane->state->src_y >>16 , - objs,NULL ); - } +if (bo->dumb) +virtio_gpu_update_dumb_bo (vgdev, bo, plane->state); DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", bo->hw_res_handle,
Signature · 1 line
2.18.1
Quoted 10 lines · Gerd Hoffmann
Little patch series doing some cleanups in the virtio driver. Patches #1 + #2 have been on the list before as single patches, includes here again for patch dependency reasons.
v2:
- fix sparse errors.
- drop merged patches (#1 + #2).please review,
Series is:
Quoted 8 lines
Gerd
Gerd Hoffmann (3):
drm/virtio: fix byteorder handling in
virtio_gpu_cmd_transfer_{from,to}_host_3d functions
drm/virtio: Simplifyvirtio_gpu_primary_plane_updateworkflow. drm/virtio: factor outvirtio_gpu_update_dumb_bo
Quoted 9 lines
drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 ++------ drivers/gpu/drm/virtio/virtgpu_plane.c | 70 +++++++++++++++----------- drivers/gpu/drm/virtio/virtgpu_vq.c | 19 +++++-- 4 files changed, 61 insertions(+), 55 deletions(-)--
2.18.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel