From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A5C4C433ED for ; Wed, 14 Apr 2021 09:57:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3112A6113D for ; Wed, 14 Apr 2021 09:57:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3112A6113D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B8B3A6E917; Wed, 14 Apr 2021 09:57:19 +0000 (UTC) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5792F6E917 for ; Wed, 14 Apr 2021 09:57:19 +0000 (UTC) Received: by mail-wm1-x330.google.com with SMTP id b136-20020a1c1b8e0000b029012c69da2040so2826067wmb.1 for ; Wed, 14 Apr 2021 02:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=innUXiB15NxWF+Gc/VTlCtD8WBbd4L/RNyxniUwRLqA=; b=Nfeo0+Sse/38E4c9WlEAr8Vf+7clPjo9Y1d4RkN05n97be+7FhZqVpXgtdBUVVaOPu kfod6S3pNEFG2b+cfZtnCwNwvZ1u2z8tc1zftUDD5kRa+z0rUPEcQP27OXq4vk5WsNJG bfV89EJBn++3UMtxSyOMS8/PDgPc8tRfSJd+o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=innUXiB15NxWF+Gc/VTlCtD8WBbd4L/RNyxniUwRLqA=; b=svKcdcoLWfeTAJwgAi0o7dsx6kW92h4NC0easDJnjOg6uTuUCavp6z48FrD8HQye1v B7veld7m5hsqGnx9pawflwfeH1dclUBU+RAaOFgXtSOK3VPWAqBercEAuf3TMtkyBsGK vXE7qQwq0JJYok6UhbFkpapC5F6pszOjhmRRf4kRjNksq3fJ2BYu+5Nw0TuvMUK7Xscy ZQkuCSiYaTXK4Ys7LPLnZfTOIv90hfuC01wle3ZGXmYZEIwhT40Gq9CWUZS+RbIuXJEk 4tGl4YTftxW12xROHYoji3ReUP0bTySKmTqCau7w8wfaaIGtelfBqlWb9wDTgmHH1YSg WabQ== X-Gm-Message-State: AOAM5331Ho9HwLZ9xlWGqnZRlvSU+C9nQGh+eAbrRimlyHz+3CDkJTJF uKq1s6qHnDUVbAUgChjS8nEHTw== X-Google-Smtp-Source: ABdhPJwmtC3RxIu6VuJ1bwJhdLL3NRAeAWOG59VuWnx7KZk0ZzWi0yELdPy3glzmyKBK6W9airtfAQ== X-Received: by 2002:a05:600c:220c:: with SMTP id z12mr2161154wml.92.1618394238095; Wed, 14 Apr 2021 02:57:18 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id f24sm4824397wmb.32.2021.04.14.02.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 02:57:17 -0700 (PDT) Date: Wed, 14 Apr 2021 11:57:15 +0200 From: Daniel Vetter To: Melissa Wen Subject: Re: [PATCH v3 4/4] drm/vkms: add overlay support Message-ID: References: <792ef462f7ffcd16559a2096673d0b3b5c09777c.1618299945.git.melissa.srw@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <792ef462f7ffcd16559a2096673d0b3b5c09777c.1618299945.git.melissa.srw@gmail.com> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Haneen Mohammed , Sumera Priyadarsini , Rodrigo Siqueira , David Airlie , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Apr 13, 2021 at 04:56:02AM -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 | 11 ++++++++++- > drivers/gpu/drm/vkms/vkms_plane.c | 14 +++++++++++--- > 5 files changed, 44 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > index 7fe1fdb3af39..73ce1d381737 100644 > --- a/drivers/gpu/drm/vkms/vkms_composer.c > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > @@ -158,11 +158,12 @@ static void compose_planes(struct vkms_composer *primary_composer, > > static int composite(void **vaddr_out, Ok this was done in patch 2, but I think the names here need a bit improvement. composite is a noun, not a verb, but this function does stuff, so we need a verb. Also I feel like compose_planes (i.e. the original name) reflects better what it actually does. > struct vkms_composer *primary_composer, > - struct vkms_composer *cursor_composer) > + struct vkms_crtc_state *crtc_state) > { > struct drm_framebuffer *fb = &primary_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); > @@ -177,8 +178,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, Ofc that then clashes with compose_planes here, but this function only composes a single plane. So the plural plane_s_ is kinda wrong, and we could just call this function compose_plane. I think with that bikeshed this reads a bit better. So please adjust that in patch 2 (keep the r-b) and this here also lgtm. Reviewed-by: Daniel Vetter > + crtc_state->active_planes[i]->composer, > + *vaddr_out); > > return 0; > } > @@ -200,7 +207,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; > @@ -224,11 +231,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; > @@ -236,7 +243,7 @@ void vkms_composer_worker(struct work_struct *work) > if (wb_pending) > vaddr_out = crtc_state->active_writeback; > > - ret = composite(&vaddr_out, primary_composer, cursor_composer); > + ret = composite(&vaddr_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 vkms_create(config); > } > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h > index 70fb79621617..ac8c9c2fa4ed 100644 > --- a/drivers/gpu/drm/vkms/vkms_drv.h > +++ b/drivers/gpu/drm/vkms/vkms_drv.h > @@ -89,6 +89,7 @@ struct vkms_device; > struct vkms_config { > bool writeback; > bool cursor; > + bool overlay; > /* only set when instantiated */ > struct vkms_device *dev; > }; > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c > index 6979fbc7f821..04406bd3ff02 100644 > --- a/drivers/gpu/drm/vkms/vkms_output.c > +++ b/drivers/gpu/drm/vkms/vkms_output.c > @@ -39,7 +39,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) > struct drm_connector *connector = &output->connector; > struct drm_encoder *encoder = &output->encoder; > struct drm_crtc *crtc = &output->crtc; > - struct vkms_plane *primary, *cursor = NULL; > + struct vkms_plane *primary, *cursor = NULL, *overlay = NULL; > int ret; > int writeback; > > @@ -47,6 +47,15 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) > if (IS_ERR(primary)) > return PTR_ERR(primary); > > + if (vkmsdev->config->overlay) { > + overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index); > + if (IS_ERR(overlay)) > + return PTR_ERR(overlay); > + > + if (!overlay->base.possible_crtcs) > + overlay->base.possible_crtcs = drm_crtc_mask(crtc); > + } > + > if (vkmsdev->config->cursor) { > cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, index); > if (IS_ERR(cursor)) > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c > index da4251aff67f..8be9eab41ea0 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.c > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > @@ -133,7 +133,7 @@ static int vkms_plane_atomic_check(struct drm_plane *plane, > if (IS_ERR(crtc_state)) > return PTR_ERR(crtc_state); > > - if (plane->type == DRM_PLANE_TYPE_CURSOR) > + if (plane->type != DRM_PLANE_TYPE_PRIMARY) > can_position = true; > > ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, > @@ -200,11 +200,19 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, > const u32 *formats; > int nformats; > > - if (type == DRM_PLANE_TYPE_CURSOR) { > + switch (type) { > + case DRM_PLANE_TYPE_PRIMARY: > + formats = vkms_formats; > + nformats = ARRAY_SIZE(vkms_formats); > + funcs = &vkms_primary_helper_funcs; > + break; > + case DRM_PLANE_TYPE_CURSOR: > + case DRM_PLANE_TYPE_OVERLAY: > formats = vkms_plane_formats; > nformats = ARRAY_SIZE(vkms_plane_formats); > funcs = &vkms_primary_helper_funcs; > - } else { > + break; > + default: > formats = vkms_formats; > nformats = ARRAY_SIZE(vkms_formats); > funcs = &vkms_primary_helper_funcs; > -- > 2.30.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel