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=-10.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 CD0A0C433B4 for ; Mon, 26 Apr 2021 17:31:40 +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 7211D6115C for ; Mon, 26 Apr 2021 17:31:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7211D6115C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 AB8856E85B; Mon, 26 Apr 2021 17:31:39 +0000 (UTC) Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0FEF6E85B for ; Mon, 26 Apr 2021 17:31:38 +0000 (UTC) Received: by mail-wm1-x329.google.com with SMTP id n3-20020a05600c4f83b02901425630b2c2so1136645wmq.1 for ; Mon, 26 Apr 2021 10:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=rk5QYP99ksIxcC0f+uGFuSzMnxljFZuGyyknr7wS6AM=; b=JcDwuSemP7rbtCwta8WTYer+hHpCwFO20SW3Wv46VeTGG2ewmuVunXTkBlBrASdMCq HiUWEK8cNKNUx1yPf6D9S494wfUVGijpNCilYn4W6DzUCayZqhYpE/1pZPQhdeHbQRtZ KetRI/G215hdgYog3gWMuIw65jPlFDNQkEh8xscSVMFIR/3bMNC3RsOApVVlxizqDj+T Zj3ChtjjG5L/DAKoWss99cyBCpPecJwkBYwipamlArvzZV8x1BoVdcWDpVKbRUWwLB9j c1oWmOFjoaemV8ZgJU4Nqi5KL7r0VVIR7AkWplDCE648Y9gbXdhKKa8ybIar1Wmqjq4n k4PQ== 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=rk5QYP99ksIxcC0f+uGFuSzMnxljFZuGyyknr7wS6AM=; b=U/h83oeDCgPGi/+X5k/Kg+kchHU5FVS5tshe7b9YDyLmJCeZ6lZwF3m6MHm9dDQ6Z4 05vkQK7x2z+Ifiv5SNSKlAF+jkhGFrnLnkOacrKdSLXLUPSfGF+xC1+1y+qSrnc5OuUt tnzHHFuG9oWnL1LGo1shGM5T9QmCYEW4utyeVr5zpnsLehATvYIiT2xD42DAQuTKkh8i H37ir6PsoF35LXyOxM5wloAPE2NqbMRr0GuQmTsFt9QIpaQXf9a5R1xkkg1aFqGRH0oC 5Xf4FBj3Fs1gR292NCP3lK973L0t1o1kykZvYH3orL2IKRV2Qm5U9xGGM9LcqSozROdy wPww== X-Gm-Message-State: AOAM531Jq5peRbSJm44zOS0aYO1JMnIdBdjMCCQjz+xAmxjJSIloKOuD to1kV/NFzz8ZH4xAhzNdkPtDI1i0u2+YoQL7 X-Google-Smtp-Source: ABdhPJxLLbT4uje14CXKSx2kVxLvFNjtjwy//qiJ+NROv8X820aW6CjGhwvA8Y5B/NbAnLuZuysX2A== X-Received: by 2002:a05:600c:350b:: with SMTP id h11mr137240wmq.103.1619458297600; Mon, 26 Apr 2021 10:31:37 -0700 (PDT) Received: from smtp.gmail.com (a95-92-181-29.cpe.netcabo.pt. [95.92.181.29]) by smtp.gmail.com with ESMTPSA id p14sm940212wrn.49.2021.04.26.10.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 10:31:37 -0700 (PDT) Date: Mon, 26 Apr 2021 14:31:28 -0300 From: Melissa Wen To: Daniel Vetter Subject: Re: [PATCH v4 3/4] drm/vkms: add XRGB planes composition Message-ID: <20210426173128.ybryk3taqf6usppv@smtp.gmail.com> References: <07bcf4643d11da9480599fe1b165e478bff58b25.1619250933.git.melissa.srw@gmail.com> <20210426110315.4e64d589@eldfell> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 04/26, Daniel Vetter wrote: > On Mon, Apr 26, 2021 at 11:03:15AM +0300, Pekka Paalanen wrote: > > On Sat, 24 Apr 2021 05:25:31 -0300 > > Melissa Wen wrote: > > > > > Add support for composing XRGB888 planes in addition to the ARGB8888 > > > format. In the case of an XRGB plane at the top, the composition consists > > > of copying the RGB values of a pixel from src to dst and clearing alpha > > > channel, without the need for alpha blending operations for each pixel. > > > > > > Blend equations assume a completely opaque background, i.e., primary plane > > > is not cleared before pixel blending but alpha channel is explicitly > > > opaque (a = 0xff). Also, there is room for performance evaluation in > > > switching pixel blend operation according to the plane format. > > > > > > v4: > > > - clear alpha channel (0xff) after blend color values by pixel > > > - improve comments on blend ops to reflect the current state > > > - describe in the commit message future improvements for plane composition > > > > > > Signed-off-by: Melissa Wen > > > Reviewed-by: Daniel Vetter > > > --- > > > drivers/gpu/drm/vkms/vkms_composer.c | 56 ++++++++++++++++++++++------ > > > drivers/gpu/drm/vkms/vkms_plane.c | 7 ++-- > > > 2 files changed, 48 insertions(+), 15 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > > > index 02642801735d..7e01bc39d2a1 100644 > > > --- a/drivers/gpu/drm/vkms/vkms_composer.c > > > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > > > @@ -4,6 +4,7 @@ > > > > > > #include > > > #include > > > +#include > > > #include > > > #include > > > #include > > > @@ -64,7 +65,17 @@ static u8 blend_channel(u8 src, u8 dst, u8 alpha) > > > return new_color; > > > } > > > > > > -static void alpha_blending(const u8 *argb_src, u8 *argb_dst) > > > +/** > > > + * alpha_blend - alpha blending equation > > > + * @argb_src: src pixel on premultiplied alpha mode > > > + * @argb_dst: dst pixel completely opaque > > > + * > > > + * blend pixels using premultiplied blend formula. The current DRM assumption > > > + * is that pixel color values have been already pre-multiplied with the alpha > > > + * channel values. See more drm_plane_create_blend_mode_property(). Also, this > > > + * formula assumes a completely opaque background. > > > + */ > > > +static void alpha_blend(const u8 *argb_src, u8 *argb_dst) > > > { > > > u8 alpha; > > > > > > @@ -72,8 +83,16 @@ static void alpha_blending(const u8 *argb_src, u8 *argb_dst) > > > argb_dst[0] = blend_channel(argb_src[0], argb_dst[0], alpha); > > > argb_dst[1] = blend_channel(argb_src[1], argb_dst[1], alpha); > > > argb_dst[2] = blend_channel(argb_src[2], argb_dst[2], alpha); > > > - /* Opaque primary */ > > > - argb_dst[3] = 0xFF; > > > +} > > > + > > > +/** > > > + * x_blend - blending equation that ignores the pixel alpha > > > + * > > > + * overwrites RGB color value from src pixel to dst pixel. > > > + */ > > > +static void x_blend(const u8 *xrgb_src, u8 *xrgb_dst) > > > +{ > > > + memcpy(xrgb_dst, xrgb_src, sizeof(u8) * 3); > > > > Hi, > > > > this function very clearly assumes a very specific pixel format on both > > source and destination. I think it would be good if the code comments > > called out exactly which DRM_FORMAT_* they assume. This would be good > > to do on almost every function that makes such assumptions. I believe that > > would help code readability, and also point out explicitly which things > > need to be fixed when you add support for even more pixel formats. > > > > "xrgb" and "argb" are IMO too vague. You might be referring to > > DRM_FORMAT_XRGB* and DRM_FORMAT_ARGB*, or maybe you are referring to any > > pixel format that happens to have or not have an alpha channel in > > addition to the three RGB channels in some order and width. > > > > Being explicit that these refer to specific DRM_FORMAT_* should also > > help understanding how things work on big-endian CPUs. My current > > understanding is that this memcpy is correct also on big-endian, given > > DRM_FORMAT_XRGB8888. This endianess issue seems a little tricky to me. I remember we have already discussed something similar when introducing alpha blend ops. I took little endian as default by a code comment on include/drm/drm_fourcc.h: DRM formats are little endian. But also, I am not sure if I got it well. > > > > Hmm, or rather, is this particular function intended to be general in > > the sense that the order of RGB channels does not matter as long as it's > > the same in both source and destination? Which would mean I had a wrong > > assumption from the start. > > Atm all vkms supports is X/ARGB8888, and even there we throw around random > limits. Add support for more pixel formats is definitely on the list, and > then all the blend/compose stuff needs to be quite drastically > rearchitected. yes, currently, we only have on vkms these two formats listed as supported (X/ARGB8888), so, I think it is ok, since we do not expected anything other than these two. > > I think until we're there documenting what's already documented in the > todo list feels like overkill. > -Daniel > > > > > > } > > > > > > /** > > > @@ -82,16 +101,20 @@ static void alpha_blending(const u8 *argb_src, u8 *argb_dst) > > > * @vaddr_src: source address > > > * @dst_composer: destination framebuffer's metadata > > > * @src_composer: source framebuffer's metadata > > > + * @pixel_blend: blending equation based on plane format > > > * > > > - * Blend the vaddr_src value with the vaddr_dst value using the pre-multiplied > > > - * alpha blending equation, since DRM currently assumes that the pixel color > > > - * values have already been pre-multiplied with the alpha channel values. See > > > - * more drm_plane_create_blend_mode_property(). This function uses buffer's > > > - * metadata to locate the new composite values at vaddr_dst. > > > + * Blend the vaddr_src value with the vaddr_dst value using a pixel blend > > > + * equation according to the plane format and clearing alpha channel to an > > > + * completely opaque background. This function uses buffer's metadata to locate > > > + * the new composite values at vaddr_dst. > > > + * > > > + * TODO: completely clear the primary plane (a = 0xff) before starting to blend > > > + * pixel color values > > > */ > > > static void blend(void *vaddr_dst, void *vaddr_src, > > > struct vkms_composer *dst_composer, > > > - struct vkms_composer *src_composer) > > > + struct vkms_composer *src_composer, > > > + void (*pixel_blend)(const u8 *, u8 *)) > > > { > > > int i, j, j_dst, i_dst; > > > int offset_src, offset_dst; > > > @@ -119,7 +142,9 @@ static void blend(void *vaddr_dst, void *vaddr_src, > > > > > > pixel_src = (u8 *)(vaddr_src + offset_src); > > > pixel_dst = (u8 *)(vaddr_dst + offset_dst); > > > - alpha_blending(pixel_src, pixel_dst); > > > + pixel_blend(pixel_src, pixel_dst); > > > + /* clearing alpha channel (0xff)*/ > > > + memset(vaddr_dst + offset_dst + 3, 0xff, 1); > > > > A one byte memset? > > > > Wouldn't pixel_dst[3] = 0xff; be more clear? yes, I will change it. Thanks for these suggestions, Melissa > > > > > > Thanks, > > pq > > > > > } > > > i_dst++; > > > } > > > @@ -131,6 +156,8 @@ static void compose_plane(struct vkms_composer *primary_composer, > > > { > > > struct drm_gem_object *plane_obj; > > > struct drm_gem_shmem_object *plane_shmem_obj; > > > + struct drm_framebuffer *fb = &plane_composer->fb; > > > + void (*pixel_blend)(const u8 *p_src, u8 *p_dst); > > > > > > plane_obj = drm_gem_fb_get_obj(&plane_composer->fb, 0); > > > plane_shmem_obj = to_drm_gem_shmem_obj(plane_obj); > > > @@ -138,8 +165,13 @@ static void compose_plane(struct vkms_composer *primary_composer, > > > if (WARN_ON(!plane_shmem_obj->vaddr)) > > > return; > > > > > > - blend(vaddr_out, plane_shmem_obj->vaddr, > > > - primary_composer, plane_composer); > > > + if (fb->format->format == DRM_FORMAT_ARGB8888) > > > + pixel_blend = &alpha_blend; > > > + else > > > + pixel_blend = &x_blend; > > > + > > > + blend(vaddr_out, plane_shmem_obj->vaddr, primary_composer, > > > + plane_composer, pixel_blend); > > > } > > > > > > static int compose_active_planes(void **vaddr_out, > > > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c > > > index 135140f8e87a..da4251aff67f 100644 > > > --- a/drivers/gpu/drm/vkms/vkms_plane.c > > > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > > > @@ -16,8 +16,9 @@ static const u32 vkms_formats[] = { > > > DRM_FORMAT_XRGB8888, > > > }; > > > > > > -static const u32 vkms_cursor_formats[] = { > > > +static const u32 vkms_plane_formats[] = { > > > DRM_FORMAT_ARGB8888, > > > + DRM_FORMAT_XRGB8888 > > > }; > > > > > > static struct drm_plane_state * > > > @@ -200,8 +201,8 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, > > > int nformats; > > > > > > if (type == DRM_PLANE_TYPE_CURSOR) { > > > - formats = vkms_cursor_formats; > > > - nformats = ARRAY_SIZE(vkms_cursor_formats); > > > + formats = vkms_plane_formats; > > > + nformats = ARRAY_SIZE(vkms_plane_formats); > > > funcs = &vkms_primary_helper_funcs; > > > } else { > > > formats = vkms_formats; > > > > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > -- > 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