Re: [RFC PATCH 3/3] drm/vkms: add overlay support
On 02/23, Daniel Vetter wrote:
> On Tue, Feb 23, 2021 at 11:21 AM Melissa Wen wrote:
> >
> > On 02/22, Daniel Vetter wrote:
> > > On Sat, Feb 20, 2021 at 11:42:12AM -0300, Melissa Wen wrote:
> > > > Add support to overlay plane, in addition to primary and cursor
> > > > planes. In this approach, the plane composition still requires an
> > > > active primary plane and planes are composed associatively in the
> > > > order: (primary <- overlay) <- cursor
> > > >
> > > > It enables to run the following IGT tests successfully:
> > > > - kms_plane_cursor:
> > > > - pipe-A-[overlay, primary, viewport]-size-[64, 128, 256]
> > > > - kms_atomic:
> > > > - plane-overlay-legacy
> > > > and preserves the successful execution of kms_cursor_crc,
> > > > kms_writeback and kms_flip
> > > >
> > > > Signed-off-by: Melissa Wen
> > > > ---
> > > > drivers/gpu/drm/vkms/vkms_composer.c | 27 +--
> > > > drivers/gpu/drm/vkms/vkms_drv.c | 5 +
> > > > drivers/gpu/drm/vkms/vkms_drv.h | 1 +
> > > > drivers/gpu/drm/vkms/vkms_output.c | 17 +++--
> > > > drivers/gpu/drm/vkms/vkms_plane.c| 20 +++-
> > > > 5 files changed, 53 insertions(+), 17 deletions(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c
> > > > b/drivers/gpu/drm/vkms/vkms_composer.c
> > > > index be8f1d33c645..2116da9b5a43 100644
> > > > --- a/drivers/gpu/drm/vkms/vkms_composer.c
> > > > +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> > > > @@ -144,11 +144,12 @@ static void compose_planes(struct vkms_composer
> > > > *primary_composer,
> > > >
> > > > static int composite(void **vaddr_out,
> > > > struct vkms_composer *primary_composer,
> > > > -struct vkms_composer *cursor_composer)
> > > > +struct vkms_crtc_state *crtc_state)
> > > > {
> > > > struct drm_framebuffer *fb = _composer->fb;
> > > > struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0);
> > > > struct drm_gem_shmem_object *shmem_obj =
> > > > to_drm_gem_shmem_obj(gem_obj);
> > > > + int i;
> > > >
> > > > if (!*vaddr_out) {
> > > > *vaddr_out = kzalloc(shmem_obj->base.size, GFP_KERNEL);
> > > > @@ -163,8 +164,14 @@ static int composite(void **vaddr_out,
> > > >
> > > > memcpy(*vaddr_out, shmem_obj->vaddr, shmem_obj->base.size);
> > > >
> > > > - if (cursor_composer)
> > > > - compose_planes(primary_composer, cursor_composer,
> > > > *vaddr_out);
> > > > + /* If there are other planes besides primary, we consider the active
> > > > +* planes should be in z-order and compose them associatively:
> > > > +* ((primary <- overlay) <- cursor)
> > > > +*/
> > > > + for (i = 1; i < crtc_state->num_active_planes; i++)
> > > > + compose_planes(primary_composer,
> > > > + crtc_state->active_planes[i]->composer,
> > > > + *vaddr_out);
> > > >
> > > > return 0;
> > > > }
> > > > @@ -186,7 +193,7 @@ void vkms_composer_worker(struct work_struct *work)
> > > > struct drm_crtc *crtc = crtc_state->base.crtc;
> > > > struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> > > > struct vkms_composer *primary_composer = NULL;
> > > > - struct vkms_composer *cursor_composer = NULL;
> > > > + struct vkms_plane_state *act_plane = NULL;
> > > > bool crc_pending, wb_pending;
> > > > void *vaddr_out = NULL;
> > > > u32 crc32 = 0;
> > > > @@ -210,11 +217,11 @@ void vkms_composer_worker(struct work_struct
> > > > *work)
> > > > if (!crc_pending)
> > > > return;
> > > >
> > > > - if (crtc_state->num_active_planes >= 1)
> > > > - primary_composer = crtc_state->active_planes[0]->composer;
> > > > -
> > > > - if (crtc_state->num_active_planes == 2)
> > > > - cursor_composer = crtc_state->active_planes[1]->composer;
> > > > + if (crtc_state->num_active_planes >= 1) {
> > > > + act_plane = crtc_state->active_planes[0];
> > > > + if (act_plane->base.plane->type == DRM_PLANE_TYPE_PRIMARY)
> > > > + primary_composer = act_plane->composer;
> > > > + }
> > > >
> > > > if (!primary_composer)
> > > > return;
> > > > @@ -222,7 +229,7 @@ void vkms_composer_worker(struct work_struct *work)
> > > > if (wb_pending)
> > > > vaddr_out = crtc_state->active_writeback;
> > > >
> > > > - ret = composite(_out, primary_composer, cursor_composer);
> > > > + ret = composite(_out, primary_composer, crtc_state);
> > > > if (ret) {
> > > > if (ret == -EINVAL && !wb_pending)
> > > > kfree(vaddr_out);
> > > > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c
> > > > b/drivers/gpu/drm/vkms/vkms_drv.c
> > > > index 2173b82606f6..027ffe759440 100644
> > > > --- a/drivers/gpu/drm/vkms/vkms_drv.c
> > > > +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> > > > @@ -44,6 +44,10 @@ static bool enable_writeback = true;
> > > >
Re: [RFC PATCH 3/3] drm/vkms: add overlay support
On Tue, Feb 23, 2021 at 11:21 AM Melissa Wen wrote:
>
> On 02/22, Daniel Vetter wrote:
> > On Sat, Feb 20, 2021 at 11:42:12AM -0300, Melissa Wen wrote:
> > > Add support to overlay plane, in addition to primary and cursor
> > > planes. In this approach, the plane composition still requires an
> > > active primary plane and planes are composed associatively in the
> > > order: (primary <- overlay) <- cursor
> > >
> > > It enables to run the following IGT tests successfully:
> > > - kms_plane_cursor:
> > > - pipe-A-[overlay, primary, viewport]-size-[64, 128, 256]
> > > - kms_atomic:
> > > - plane-overlay-legacy
> > > and preserves the successful execution of kms_cursor_crc,
> > > kms_writeback and kms_flip
> > >
> > > Signed-off-by: Melissa Wen
> > > ---
> > > drivers/gpu/drm/vkms/vkms_composer.c | 27 +--
> > > drivers/gpu/drm/vkms/vkms_drv.c | 5 +
> > > drivers/gpu/drm/vkms/vkms_drv.h | 1 +
> > > drivers/gpu/drm/vkms/vkms_output.c | 17 +++--
> > > drivers/gpu/drm/vkms/vkms_plane.c| 20 +++-
> > > 5 files changed, 53 insertions(+), 17 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c
> > > b/drivers/gpu/drm/vkms/vkms_composer.c
> > > index be8f1d33c645..2116da9b5a43 100644
> > > --- a/drivers/gpu/drm/vkms/vkms_composer.c
> > > +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> > > @@ -144,11 +144,12 @@ static void compose_planes(struct vkms_composer
> > > *primary_composer,
> > >
> > > static int composite(void **vaddr_out,
> > > struct vkms_composer *primary_composer,
> > > -struct vkms_composer *cursor_composer)
> > > +struct vkms_crtc_state *crtc_state)
> > > {
> > > struct drm_framebuffer *fb = _composer->fb;
> > > struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0);
> > > struct drm_gem_shmem_object *shmem_obj =
> > > to_drm_gem_shmem_obj(gem_obj);
> > > + int i;
> > >
> > > if (!*vaddr_out) {
> > > *vaddr_out = kzalloc(shmem_obj->base.size, GFP_KERNEL);
> > > @@ -163,8 +164,14 @@ static int composite(void **vaddr_out,
> > >
> > > memcpy(*vaddr_out, shmem_obj->vaddr, shmem_obj->base.size);
> > >
> > > - if (cursor_composer)
> > > - compose_planes(primary_composer, cursor_composer, *vaddr_out);
> > > + /* If there are other planes besides primary, we consider the active
> > > +* planes should be in z-order and compose them associatively:
> > > +* ((primary <- overlay) <- cursor)
> > > +*/
> > > + for (i = 1; i < crtc_state->num_active_planes; i++)
> > > + compose_planes(primary_composer,
> > > + crtc_state->active_planes[i]->composer,
> > > + *vaddr_out);
> > >
> > > return 0;
> > > }
> > > @@ -186,7 +193,7 @@ void vkms_composer_worker(struct work_struct *work)
> > > struct drm_crtc *crtc = crtc_state->base.crtc;
> > > struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> > > struct vkms_composer *primary_composer = NULL;
> > > - struct vkms_composer *cursor_composer = NULL;
> > > + struct vkms_plane_state *act_plane = NULL;
> > > bool crc_pending, wb_pending;
> > > void *vaddr_out = NULL;
> > > u32 crc32 = 0;
> > > @@ -210,11 +217,11 @@ void vkms_composer_worker(struct work_struct *work)
> > > if (!crc_pending)
> > > return;
> > >
> > > - if (crtc_state->num_active_planes >= 1)
> > > - primary_composer = crtc_state->active_planes[0]->composer;
> > > -
> > > - if (crtc_state->num_active_planes == 2)
> > > - cursor_composer = crtc_state->active_planes[1]->composer;
> > > + if (crtc_state->num_active_planes >= 1) {
> > > + act_plane = crtc_state->active_planes[0];
> > > + if (act_plane->base.plane->type == DRM_PLANE_TYPE_PRIMARY)
> > > + primary_composer = act_plane->composer;
> > > + }
> > >
> > > if (!primary_composer)
> > > return;
> > > @@ -222,7 +229,7 @@ void vkms_composer_worker(struct work_struct *work)
> > > if (wb_pending)
> > > vaddr_out = crtc_state->active_writeback;
> > >
> > > - ret = composite(_out, primary_composer, cursor_composer);
> > > + ret = composite(_out, primary_composer, crtc_state);
> > > if (ret) {
> > > if (ret == -EINVAL && !wb_pending)
> > > kfree(vaddr_out);
> > > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c
> > > b/drivers/gpu/drm/vkms/vkms_drv.c
> > > index 2173b82606f6..027ffe759440 100644
> > > --- a/drivers/gpu/drm/vkms/vkms_drv.c
> > > +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> > > @@ -44,6 +44,10 @@ static bool enable_writeback = true;
> > > module_param_named(enable_writeback, enable_writeback, bool, 0444);
> > > MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector
> > > support");
> > >
> > > +static bool enable_overlay;
> > > +module_param_named(enable_overlay,
Re: [RFC PATCH 3/3] drm/vkms: add overlay support
On 02/22, Daniel Vetter wrote:
> On Sat, Feb 20, 2021 at 11:42:12AM -0300, Melissa Wen wrote:
> > Add support to overlay plane, in addition to primary and cursor
> > planes. In this approach, the plane composition still requires an
> > active primary plane and planes are composed associatively in the
> > order: (primary <- overlay) <- cursor
> >
> > It enables to run the following IGT tests successfully:
> > - kms_plane_cursor:
> > - pipe-A-[overlay, primary, viewport]-size-[64, 128, 256]
> > - kms_atomic:
> > - plane-overlay-legacy
> > and preserves the successful execution of kms_cursor_crc,
> > kms_writeback and kms_flip
> >
> > Signed-off-by: Melissa Wen
> > ---
> > drivers/gpu/drm/vkms/vkms_composer.c | 27 +--
> > drivers/gpu/drm/vkms/vkms_drv.c | 5 +
> > drivers/gpu/drm/vkms/vkms_drv.h | 1 +
> > drivers/gpu/drm/vkms/vkms_output.c | 17 +++--
> > drivers/gpu/drm/vkms/vkms_plane.c| 20 +++-
> > 5 files changed, 53 insertions(+), 17 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c
> > b/drivers/gpu/drm/vkms/vkms_composer.c
> > index be8f1d33c645..2116da9b5a43 100644
> > --- a/drivers/gpu/drm/vkms/vkms_composer.c
> > +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> > @@ -144,11 +144,12 @@ static void compose_planes(struct vkms_composer
> > *primary_composer,
> >
> > static int composite(void **vaddr_out,
> > struct vkms_composer *primary_composer,
> > -struct vkms_composer *cursor_composer)
> > +struct vkms_crtc_state *crtc_state)
> > {
> > struct drm_framebuffer *fb = _composer->fb;
> > struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0);
> > struct drm_gem_shmem_object *shmem_obj = to_drm_gem_shmem_obj(gem_obj);
> > + int i;
> >
> > if (!*vaddr_out) {
> > *vaddr_out = kzalloc(shmem_obj->base.size, GFP_KERNEL);
> > @@ -163,8 +164,14 @@ static int composite(void **vaddr_out,
> >
> > memcpy(*vaddr_out, shmem_obj->vaddr, shmem_obj->base.size);
> >
> > - if (cursor_composer)
> > - compose_planes(primary_composer, cursor_composer, *vaddr_out);
> > + /* If there are other planes besides primary, we consider the active
> > +* planes should be in z-order and compose them associatively:
> > +* ((primary <- overlay) <- cursor)
> > +*/
> > + for (i = 1; i < crtc_state->num_active_planes; i++)
> > + compose_planes(primary_composer,
> > + crtc_state->active_planes[i]->composer,
> > + *vaddr_out);
> >
> > return 0;
> > }
> > @@ -186,7 +193,7 @@ void vkms_composer_worker(struct work_struct *work)
> > struct drm_crtc *crtc = crtc_state->base.crtc;
> > struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> > struct vkms_composer *primary_composer = NULL;
> > - struct vkms_composer *cursor_composer = NULL;
> > + struct vkms_plane_state *act_plane = NULL;
> > bool crc_pending, wb_pending;
> > void *vaddr_out = NULL;
> > u32 crc32 = 0;
> > @@ -210,11 +217,11 @@ void vkms_composer_worker(struct work_struct *work)
> > if (!crc_pending)
> > return;
> >
> > - if (crtc_state->num_active_planes >= 1)
> > - primary_composer = crtc_state->active_planes[0]->composer;
> > -
> > - if (crtc_state->num_active_planes == 2)
> > - cursor_composer = crtc_state->active_planes[1]->composer;
> > + if (crtc_state->num_active_planes >= 1) {
> > + act_plane = crtc_state->active_planes[0];
> > + if (act_plane->base.plane->type == DRM_PLANE_TYPE_PRIMARY)
> > + primary_composer = act_plane->composer;
> > + }
> >
> > if (!primary_composer)
> > return;
> > @@ -222,7 +229,7 @@ void vkms_composer_worker(struct work_struct *work)
> > if (wb_pending)
> > vaddr_out = crtc_state->active_writeback;
> >
> > - ret = composite(_out, primary_composer, cursor_composer);
> > + ret = composite(_out, primary_composer, crtc_state);
> > if (ret) {
> > if (ret == -EINVAL && !wb_pending)
> > kfree(vaddr_out);
> > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c
> > b/drivers/gpu/drm/vkms/vkms_drv.c
> > index 2173b82606f6..027ffe759440 100644
> > --- a/drivers/gpu/drm/vkms/vkms_drv.c
> > +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> > @@ -44,6 +44,10 @@ static bool enable_writeback = true;
> > module_param_named(enable_writeback, enable_writeback, bool, 0444);
> > MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector
> > support");
> >
> > +static bool enable_overlay;
> > +module_param_named(enable_overlay, enable_overlay, bool, 0444);
> > +MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support");
> > +
> > DEFINE_DRM_GEM_FOPS(vkms_driver_fops);
> >
> > static void vkms_release(struct drm_device *dev)
> > @@ -198,6 +202,7 @@ static int __init vkms_init(void)
Re: [RFC PATCH 3/3] drm/vkms: add overlay support
On Sat, Feb 20, 2021 at 11:42:12AM -0300, Melissa Wen wrote:
> Add support to overlay plane, in addition to primary and cursor
> planes. In this approach, the plane composition still requires an
> active primary plane and planes are composed associatively in the
> order: (primary <- overlay) <- cursor
>
> It enables to run the following IGT tests successfully:
> - kms_plane_cursor:
> - pipe-A-[overlay, primary, viewport]-size-[64, 128, 256]
> - kms_atomic:
> - plane-overlay-legacy
> and preserves the successful execution of kms_cursor_crc,
> kms_writeback and kms_flip
>
> Signed-off-by: Melissa Wen
> ---
> drivers/gpu/drm/vkms/vkms_composer.c | 27 +--
> drivers/gpu/drm/vkms/vkms_drv.c | 5 +
> drivers/gpu/drm/vkms/vkms_drv.h | 1 +
> drivers/gpu/drm/vkms/vkms_output.c | 17 +++--
> drivers/gpu/drm/vkms/vkms_plane.c| 20 +++-
> 5 files changed, 53 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.c
> b/drivers/gpu/drm/vkms/vkms_composer.c
> index be8f1d33c645..2116da9b5a43 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.c
> +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> @@ -144,11 +144,12 @@ static void compose_planes(struct vkms_composer
> *primary_composer,
>
> static int composite(void **vaddr_out,
>struct vkms_composer *primary_composer,
> - struct vkms_composer *cursor_composer)
> + struct vkms_crtc_state *crtc_state)
> {
> struct drm_framebuffer *fb = _composer->fb;
> struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0);
> struct drm_gem_shmem_object *shmem_obj = to_drm_gem_shmem_obj(gem_obj);
> + int i;
>
> if (!*vaddr_out) {
> *vaddr_out = kzalloc(shmem_obj->base.size, GFP_KERNEL);
> @@ -163,8 +164,14 @@ static int composite(void **vaddr_out,
>
> memcpy(*vaddr_out, shmem_obj->vaddr, shmem_obj->base.size);
>
> - if (cursor_composer)
> - compose_planes(primary_composer, cursor_composer, *vaddr_out);
> + /* If there are other planes besides primary, we consider the active
> + * planes should be in z-order and compose them associatively:
> + * ((primary <- overlay) <- cursor)
> + */
> + for (i = 1; i < crtc_state->num_active_planes; i++)
> + compose_planes(primary_composer,
> +crtc_state->active_planes[i]->composer,
> +*vaddr_out);
>
> return 0;
> }
> @@ -186,7 +193,7 @@ void vkms_composer_worker(struct work_struct *work)
> struct drm_crtc *crtc = crtc_state->base.crtc;
> struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> struct vkms_composer *primary_composer = NULL;
> - struct vkms_composer *cursor_composer = NULL;
> + struct vkms_plane_state *act_plane = NULL;
> bool crc_pending, wb_pending;
> void *vaddr_out = NULL;
> u32 crc32 = 0;
> @@ -210,11 +217,11 @@ void vkms_composer_worker(struct work_struct *work)
> if (!crc_pending)
> return;
>
> - if (crtc_state->num_active_planes >= 1)
> - primary_composer = crtc_state->active_planes[0]->composer;
> -
> - if (crtc_state->num_active_planes == 2)
> - cursor_composer = crtc_state->active_planes[1]->composer;
> + if (crtc_state->num_active_planes >= 1) {
> + act_plane = crtc_state->active_planes[0];
> + if (act_plane->base.plane->type == DRM_PLANE_TYPE_PRIMARY)
> + primary_composer = act_plane->composer;
> + }
>
> if (!primary_composer)
> return;
> @@ -222,7 +229,7 @@ void vkms_composer_worker(struct work_struct *work)
> if (wb_pending)
> vaddr_out = crtc_state->active_writeback;
>
> - ret = composite(_out, primary_composer, cursor_composer);
> + ret = composite(_out, primary_composer, crtc_state);
> if (ret) {
> if (ret == -EINVAL && !wb_pending)
> kfree(vaddr_out);
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
> index 2173b82606f6..027ffe759440 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.c
> +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> @@ -44,6 +44,10 @@ static bool enable_writeback = true;
> module_param_named(enable_writeback, enable_writeback, bool, 0444);
> MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector
> support");
>
> +static bool enable_overlay;
> +module_param_named(enable_overlay, enable_overlay, bool, 0444);
> +MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support");
> +
> DEFINE_DRM_GEM_FOPS(vkms_driver_fops);
>
> static void vkms_release(struct drm_device *dev)
> @@ -198,6 +202,7 @@ static int __init vkms_init(void)
>
> config->cursor = enable_cursor;
> config->writeback = enable_writeback;
> + config->overlay = enable_overlay;
>
> return
