| Message ID | 20220121213831.47229-6-igormtorrente@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add new formats support to vkms | expand |
On 01/21, Igor Torrente wrote: > This commit is the groundwork to introduce new formats to the planes and > writeback buffer. As part of it, a new buffer metadata field is added to > `vkms_writeback_job`, this metadata is represented by the `vkms_composer` > struct. > > This will allow us, in the future, to have different compositing and wb > format types. lgtm. Reviewed-by: Melissa Wen <mwen@igalia.com> > > Signed-off-by: Igor Torrente <igormtorrente@gmail.com> > --- > V2: Change the code to get the drm_framebuffer reference and not copy its > contents(Thomas Zimmermann). > > V3: Drop the refcount in the wb code(Thomas Zimmermann). > --- > drivers/gpu/drm/vkms/vkms_composer.c | 4 ++-- > drivers/gpu/drm/vkms/vkms_drv.h | 12 ++++++------ > drivers/gpu/drm/vkms/vkms_plane.c | 10 +++++----- > drivers/gpu/drm/vkms/vkms_writeback.c | 20 +++++++++++++++++--- > 4 files changed, 30 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > index 2d946368a561..95029d2ebcac 100644 > --- a/drivers/gpu/drm/vkms/vkms_composer.c > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > @@ -153,7 +153,7 @@ static void compose_plane(struct vkms_frame_info *primary_plane_info, > struct vkms_frame_info *plane_frame_info, > void *vaddr_out) > { > - struct drm_framebuffer *fb = &plane_frame_info->fb; > + struct drm_framebuffer *fb = plane_frame_info->fb; > void *vaddr; > void (*pixel_blend)(const u8 *p_src, u8 *p_dst); > > @@ -175,7 +175,7 @@ static int compose_active_planes(void **vaddr_out, > struct vkms_frame_info *primary_plane_info, > struct vkms_crtc_state *crtc_state) > { > - struct drm_framebuffer *fb = &primary_plane_info->fb; > + struct drm_framebuffer *fb = primary_plane_info->fb; > struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0); > const void *vaddr; > int i; > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h > index 2e6342164bef..c850d755247c 100644 > --- a/drivers/gpu/drm/vkms/vkms_drv.h > +++ b/drivers/gpu/drm/vkms/vkms_drv.h > @@ -22,13 +22,8 @@ > > #define NUM_OVERLAY_PLANES 8 > > -struct vkms_writeback_job { > - struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; > - struct dma_buf_map data[DRM_FORMAT_MAX_PLANES]; > -}; > - > struct vkms_frame_info { > - struct drm_framebuffer fb; > + struct drm_framebuffer *fb; > struct drm_rect src, dst; > struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; > unsigned int offset; > @@ -36,6 +31,11 @@ struct vkms_frame_info { > unsigned int cpp; > }; > > +struct vkms_writeback_job { > + struct dma_buf_map data[DRM_FORMAT_MAX_PLANES]; > + struct vkms_frame_info frame_info; > +}; > + > /** > * vkms_plane_state - Driver specific plane state > * @base: base plane state > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c > index a56b0f76eddd..28752af0118c 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.c > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > @@ -50,12 +50,12 @@ static void vkms_plane_destroy_state(struct drm_plane *plane, > struct vkms_plane_state *vkms_state = to_vkms_plane_state(old_state); > struct drm_crtc *crtc = vkms_state->base.base.crtc; > > - if (crtc) { > + if (crtc && vkms_state->frame_info->fb) { > /* dropping the reference we acquired in > * vkms_primary_plane_update() > */ > - if (drm_framebuffer_read_refcount(&vkms_state->frame_info->fb)) > - drm_framebuffer_put(&vkms_state->frame_info->fb); > + if (drm_framebuffer_read_refcount(vkms_state->frame_info->fb)) > + drm_framebuffer_put(vkms_state->frame_info->fb); > } > > kfree(vkms_state->frame_info); > @@ -110,9 +110,9 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, > frame_info = vkms_plane_state->frame_info; > memcpy(&frame_info->src, &new_state->src, sizeof(struct drm_rect)); > memcpy(&frame_info->dst, &new_state->dst, sizeof(struct drm_rect)); > - memcpy(&frame_info->fb, fb, sizeof(struct drm_framebuffer)); > + frame_info->fb = fb; > memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->map)); > - drm_framebuffer_get(&frame_info->fb); > + drm_framebuffer_get(frame_info->fb); > frame_info->offset = fb->offsets[0]; > frame_info->pitch = fb->pitches[0]; > frame_info->cpp = fb->format->cpp[0]; > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c > index 8694227f555f..de379331b236 100644 > --- a/drivers/gpu/drm/vkms/vkms_writeback.c > +++ b/drivers/gpu/drm/vkms/vkms_writeback.c > @@ -75,12 +75,15 @@ static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector, > if (!vkmsjob) > return -ENOMEM; > > - ret = drm_gem_fb_vmap(job->fb, vkmsjob->map, vkmsjob->data); > + ret = drm_gem_fb_vmap(job->fb, vkmsjob->frame_info.map, vkmsjob->data); > if (ret) { > DRM_ERROR("vmap failed: %d\n", ret); > goto err_kfree; > } > > + vkmsjob->frame_info.fb = job->fb; > + drm_framebuffer_get(vkmsjob->frame_info.fb); > + > job->priv = vkmsjob; > > return 0; > @@ -99,7 +102,9 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector, > if (!job->fb) > return; > > - drm_gem_fb_vunmap(job->fb, vkmsjob->map); > + drm_gem_fb_vunmap(job->fb, vkmsjob->frame_info.map); > + > + drm_framebuffer_put(vkmsjob->frame_info.fb); > > vkmsdev = drm_device_to_vkms_device(job->fb->dev); > vkms_set_composer(&vkmsdev->output, false); > @@ -116,14 +121,23 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn, > struct drm_writeback_connector *wb_conn = &output->wb_connector; > struct drm_connector_state *conn_state = wb_conn->base.state; > struct vkms_crtc_state *crtc_state = output->composer_state; > + struct drm_framebuffer *fb = connector_state->writeback_job->fb; > + struct vkms_writeback_job *active_wb; > + struct vkms_frame_info *wb_frame_info; > > if (!conn_state) > return; > > vkms_set_composer(&vkmsdev->output, true); > > + active_wb = conn_state->writeback_job->priv; > + wb_frame_info = &active_wb->frame_info; > + > spin_lock_irq(&output->composer_lock); > - crtc_state->active_writeback = conn_state->writeback_job->priv; > + crtc_state->active_writeback = active_wb; > + wb_frame_info->offset = fb->offsets[0]; > + wb_frame_info->pitch = fb->pitches[0]; > + wb_frame_info->cpp = fb->format->cpp[0]; > crtc_state->wb_pending = true; > spin_unlock_irq(&output->composer_lock); > drm_writeback_queue_job(wb_conn, connector_state); > -- > 2.30.2 >
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 2d946368a561..95029d2ebcac 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -153,7 +153,7 @@ static void compose_plane(struct vkms_frame_info *primary_plane_info, struct vkms_frame_info *plane_frame_info, void *vaddr_out) { - struct drm_framebuffer *fb = &plane_frame_info->fb; + struct drm_framebuffer *fb = plane_frame_info->fb; void *vaddr; void (*pixel_blend)(const u8 *p_src, u8 *p_dst); @@ -175,7 +175,7 @@ static int compose_active_planes(void **vaddr_out, struct vkms_frame_info *primary_plane_info, struct vkms_crtc_state *crtc_state) { - struct drm_framebuffer *fb = &primary_plane_info->fb; + struct drm_framebuffer *fb = primary_plane_info->fb; struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0); const void *vaddr; int i; diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 2e6342164bef..c850d755247c 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -22,13 +22,8 @@ #define NUM_OVERLAY_PLANES 8 -struct vkms_writeback_job { - struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; - struct dma_buf_map data[DRM_FORMAT_MAX_PLANES]; -}; - struct vkms_frame_info { - struct drm_framebuffer fb; + struct drm_framebuffer *fb; struct drm_rect src, dst; struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; unsigned int offset; @@ -36,6 +31,11 @@ struct vkms_frame_info { unsigned int cpp; }; +struct vkms_writeback_job { + struct dma_buf_map data[DRM_FORMAT_MAX_PLANES]; + struct vkms_frame_info frame_info; +}; + /** * vkms_plane_state - Driver specific plane state * @base: base plane state diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index a56b0f76eddd..28752af0118c 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -50,12 +50,12 @@ static void vkms_plane_destroy_state(struct drm_plane *plane, struct vkms_plane_state *vkms_state = to_vkms_plane_state(old_state); struct drm_crtc *crtc = vkms_state->base.base.crtc; - if (crtc) { + if (crtc && vkms_state->frame_info->fb) { /* dropping the reference we acquired in * vkms_primary_plane_update() */ - if (drm_framebuffer_read_refcount(&vkms_state->frame_info->fb)) - drm_framebuffer_put(&vkms_state->frame_info->fb); + if (drm_framebuffer_read_refcount(vkms_state->frame_info->fb)) + drm_framebuffer_put(vkms_state->frame_info->fb); } kfree(vkms_state->frame_info); @@ -110,9 +110,9 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, frame_info = vkms_plane_state->frame_info; memcpy(&frame_info->src, &new_state->src, sizeof(struct drm_rect)); memcpy(&frame_info->dst, &new_state->dst, sizeof(struct drm_rect)); - memcpy(&frame_info->fb, fb, sizeof(struct drm_framebuffer)); + frame_info->fb = fb; memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->map)); - drm_framebuffer_get(&frame_info->fb); + drm_framebuffer_get(frame_info->fb); frame_info->offset = fb->offsets[0]; frame_info->pitch = fb->pitches[0]; frame_info->cpp = fb->format->cpp[0]; diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 8694227f555f..de379331b236 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -75,12 +75,15 @@ static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector, if (!vkmsjob) return -ENOMEM; - ret = drm_gem_fb_vmap(job->fb, vkmsjob->map, vkmsjob->data); + ret = drm_gem_fb_vmap(job->fb, vkmsjob->frame_info.map, vkmsjob->data); if (ret) { DRM_ERROR("vmap failed: %d\n", ret); goto err_kfree; } + vkmsjob->frame_info.fb = job->fb; + drm_framebuffer_get(vkmsjob->frame_info.fb); + job->priv = vkmsjob; return 0; @@ -99,7 +102,9 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector, if (!job->fb) return; - drm_gem_fb_vunmap(job->fb, vkmsjob->map); + drm_gem_fb_vunmap(job->fb, vkmsjob->frame_info.map); + + drm_framebuffer_put(vkmsjob->frame_info.fb); vkmsdev = drm_device_to_vkms_device(job->fb->dev); vkms_set_composer(&vkmsdev->output, false); @@ -116,14 +121,23 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn, struct drm_writeback_connector *wb_conn = &output->wb_connector; struct drm_connector_state *conn_state = wb_conn->base.state; struct vkms_crtc_state *crtc_state = output->composer_state; + struct drm_framebuffer *fb = connector_state->writeback_job->fb; + struct vkms_writeback_job *active_wb; + struct vkms_frame_info *wb_frame_info; if (!conn_state) return; vkms_set_composer(&vkmsdev->output, true); + active_wb = conn_state->writeback_job->priv; + wb_frame_info = &active_wb->frame_info; + spin_lock_irq(&output->composer_lock); - crtc_state->active_writeback = conn_state->writeback_job->priv; + crtc_state->active_writeback = active_wb; + wb_frame_info->offset = fb->offsets[0]; + wb_frame_info->pitch = fb->pitches[0]; + wb_frame_info->cpp = fb->format->cpp[0]; crtc_state->wb_pending = true; spin_unlock_irq(&output->composer_lock); drm_writeback_queue_job(wb_conn, connector_state);
This commit is the groundwork to introduce new formats to the planes and writeback buffer. As part of it, a new buffer metadata field is added to `vkms_writeback_job`, this metadata is represented by the `vkms_composer` struct. This will allow us, in the future, to have different compositing and wb format types. Signed-off-by: Igor Torrente <igormtorrente@gmail.com> --- V2: Change the code to get the drm_framebuffer reference and not copy its contents(Thomas Zimmermann). V3: Drop the refcount in the wb code(Thomas Zimmermann). --- drivers/gpu/drm/vkms/vkms_composer.c | 4 ++-- drivers/gpu/drm/vkms/vkms_drv.h | 12 ++++++------ drivers/gpu/drm/vkms/vkms_plane.c | 10 +++++----- drivers/gpu/drm/vkms/vkms_writeback.c | 20 +++++++++++++++++--- 4 files changed, 30 insertions(+), 16 deletions(-)