Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp3433786lqp; Tue, 26 Mar 2024 09:02:55 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXnPq4SRn1zQIkngDTKkqAUrUUkvREoYO5mXBla4+RRXPTHSR7XdCK2mLZbfdkPqBFuF1qw7LdnxHS3qH9IdZMJDPljHduzwQ3RITArGQ== X-Google-Smtp-Source: AGHT+IGyLOIfgA46dFZca8BaWfpd47kxKMmGmP75QskY+fTc+52pBP00VSvljTNCscpzCs3XMmTV X-Received: by 2002:a17:90a:a60d:b0:2a0:8aec:735b with SMTP id c13-20020a17090aa60d00b002a08aec735bmr1406624pjq.41.1711468974866; Tue, 26 Mar 2024 09:02:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711468974; cv=pass; d=google.com; s=arc-20160816; b=l/dhbteweoXvO+35UFhNYsRL/hkulIRnVyOe6CZYGUv3XZrSUa5OpzoPpgPOT+8bh9 E15+CHcGVvBKq9M3A+bPzi7TfKzhccoMKa/znPxxr1E7e3blplM/yDCgLesDe6n+xxcS P4szH3XltCoPuiG6vn/elpXXgdENnlRPRHd/mXAHjOSwxEqFmufdXpjuH7w6gaaG8G/d MwZjMzKKChDSl2JO4qIpA+fiI3xPxK+GB7SHYoMKw2d2jt2sU1WeINMTbX/YPCwAj/yy M+38PP5jmtOnnoW2dE1TbREdWP07lY2/XmifXqEy4m8Yd30mjQY4W5DU3uB+d2VEZRQD SeWQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:mail-followup-to:message-id:subject:cc:to:from:date :dkim-signature; bh=q1uJ/RBI+EkkLIUGkhABf9Eh5HJHwMfNRGz85xDYfxU=; fh=45eQo3ZJsZ9kxlKtiBlNFdEPxIxcGnXy8eMk/mnf88Q=; b=fx4fjAkXj54x6erbIhY+lSEq9YdKGBr5YTsvvGycRaZtto3l3Nd77voZNv2NcSAXX6 VF3uBZ/ZDNN9jM6iI38gWYT+mqE3Qya1jpwT5cpkv7kd9+bbPZ/OhMG2/MATryQ4vvFe 1lWtIRJRLL0CPHFCeh7NiWrvBWi1/EjrDV3t/+v/puGcgFFFtNjPegTkOFEVR2dZ4N8v bC53nEKf9fGZlG22DJKMcGlJs2LoWi4f4Pgn8hUj+1fxjKMjDoX0U4ixo0VMwkHELTe1 ItriG1Q9bcYlkHfjnunFMw6mXd2JWwS191ioltkk2AQtq7WIxNY3cMLJzGGrIc63XguP D3bw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Q85Qfhmn; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-119409-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-119409-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id y23-20020a17090aa41700b002a028dfe76dsi10707327pjp.173.2024.03.26.09.02.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 09:02:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-119409-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Q85Qfhmn; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-119409-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-119409-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id CC9413214A4 for ; Tue, 26 Mar 2024 15:59:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 916CC13D261; Tue, 26 Mar 2024 15:57:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="Q85Qfhmn" Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9205013C8EC for ; Tue, 26 Mar 2024 15:57:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711468634; cv=none; b=TVcLkWoJxMS+x9b4x+InP2ZOPI1zW3wt6tDWOs62Cw4t4/aeVFW+Kl7IQNcDRr9nLRWutDcc7X6gcvaxdJI6p4yeNe6eiTsNl6/N3TPA6Y8QFvX71TZLk/fq3rpfmTgjQglwSCs8YLGoBnm91k7vsCVJfjrE1+EHMIS7mw8zXPk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711468634; c=relaxed/simple; bh=/86P2xRlq6dzqzFLUaNHlwgY9i+1+hEvS45HNU8ds/4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=qbFRfmqARZbkkxw4jdvEg//asww9RVz0oo+Ko0GNrx3PaAglSG3/m8inA/ODpKG60HbNBEB7O9EIOpGmZmc7qUSvaUHtT3IooUGgfVCncEwkTJA13V8ieaKCBR2B14l8OZ8gXVWKLQsg8/yKmrk45UCXXbiudFGzEXhFcZUBThQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=Q85Qfhmn; arc=none smtp.client-ip=217.70.183.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 52F291BF209; Tue, 26 Mar 2024 15:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1711468624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q1uJ/RBI+EkkLIUGkhABf9Eh5HJHwMfNRGz85xDYfxU=; b=Q85Qfhmn63Gr9VJy1jvFJFWp7zCfZf7FFYjAio0Zx9nFnDWqTJvE7hebKmLJX9NRoGlDe4 X9KhqxgHqTAffeh8H2wRTfYg0F4zETt/PJQBEHqkNcnRgCuzrdlIpT5aIPfcdTJVj6EyiF mkJLSXxrDRb3ifYnwgF6rKewqm9odzf6Jk6gdRj3H5nrFqhzB6f39pQgI04uxhCoVrVebY yRfkKxjlgbARfrqbslPoFNgdAn4+LdzAm60xT2M9aEOLEm+wHOQ2X/Ncx7dDSGB8YsssMO hPCCtPsFSyJhADVFBGPrQ7QhrxlhzT4zD/YclPq8g5drsemMxlmQE2fVHopFeA== Date: Tue, 26 Mar 2024 16:57:00 +0100 From: Louis Chauvet To: Pekka Paalanen Cc: Rodrigo Siqueira , Melissa Wen , =?iso-8859-1?Q?Ma=EDra?= Canal , Haneen Mohammed , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , arthurgrillo@riseup.net, Jonathan Corbet , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com, thomas.petazzoni@bootlin.com, seanpaul@google.com, marcheu@google.com, nicolejadeyee@google.com Subject: Re: [PATCH v5 08/16] drm/vkms: Avoid computing blending limits inside pre_mul_alpha_blend Message-ID: Mail-Followup-To: Pekka Paalanen , Rodrigo Siqueira , Melissa Wen , =?iso-8859-1?Q?Ma=EDra?= Canal , Haneen Mohammed , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , arthurgrillo@riseup.net, Jonathan Corbet , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com, thomas.petazzoni@bootlin.com, seanpaul@google.com, marcheu@google.com, nicolejadeyee@google.com References: <20240313-yuv-v5-0-e610cbd03f52@bootlin.com> <20240313-yuv-v5-8-e610cbd03f52@bootlin.com> <20240325144101.6d9fcf7e.pekka.paalanen@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240325144101.6d9fcf7e.pekka.paalanen@collabora.com> X-GND-Sasl: louis.chauvet@bootlin.com Le 25/03/24 - 14:41, Pekka Paalanen a ?crit : > On Wed, 13 Mar 2024 18:45:02 +0100 > Louis Chauvet wrote: > > > The pre_mul_alpha_blend is dedicated to blending, so to avoid mixing > > different concepts (coordinate calculation and color management), extract > > the x_limit and x_dst computation outside of this helper. > > It also increases the maintainability by grouping the computation related > > to coordinates in the same place: the loop in `blend`. > > > > Signed-off-by: Louis Chauvet > > --- > > drivers/gpu/drm/vkms/vkms_composer.c | 40 +++++++++++++++++------------------- > > 1 file changed, 19 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > > index da0651a94c9b..9254086f23ff 100644 > > --- a/drivers/gpu/drm/vkms/vkms_composer.c > > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > > @@ -24,34 +24,30 @@ static u16 pre_mul_blend_channel(u16 src, u16 dst, u16 alpha) > > > > /** > > * pre_mul_alpha_blend - alpha blending equation > > - * @frame_info: Source framebuffer's metadata > > * @stage_buffer: The line with the pixels from src_plane > > * @output_buffer: A line buffer that receives all the blends output > > + * @x_start: The start offset to avoid useless copy > > I'd say just: > > + * @x_start: The start offset > > It describes the parameter, and the paragraph below explains the why. > > It would be explaining, that x_start applies to output_buffer, but > input_buffer is always read starting from 0. I will change it to: * Using @x_start and @count information, only few pixel can be blended instead of the whole line * each time. @x_start is only used for the output buffer. The staging buffer is always read from * the start (0..@count in stage_buffer is blended at @x_start..@x_start+@count in output_buffer). > > + * @count: The number of byte to copy > > You named it pixel_count, and it counts pixels, not bytes. It's not a > copy but a blend into output_buffer. Oops, fixed in v6. > > * > > - * Using the information from the `frame_info`, this blends only the > > - * necessary pixels from the `stage_buffer` to the `output_buffer` > > - * using premultiplied blend formula. > > + * Using @x_start and @count information, only few pixel can be blended instead of the whole line > > + * each time. > > * > > * 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 pre_mul_alpha_blend(struct vkms_frame_info *frame_info, > > - struct line_buffer *stage_buffer, > > - struct line_buffer *output_buffer) > > +static void pre_mul_alpha_blend(const struct line_buffer *stage_buffer, > > + struct line_buffer *output_buffer, int x_start, int pixel_count) > > { > > - int x_dst = frame_info->dst.x1; > > - struct pixel_argb_u16 *out = output_buffer->pixels + x_dst; > > - struct pixel_argb_u16 *in = stage_buffer->pixels; > > - int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > > - stage_buffer->n_pixels); > > - > > - for (int x = 0; x < x_limit; x++) { > > - out[x].a = (u16)0xffff; > > - out[x].r = pre_mul_blend_channel(in[x].r, out[x].r, in[x].a); > > - out[x].g = pre_mul_blend_channel(in[x].g, out[x].g, in[x].a); > > - out[x].b = pre_mul_blend_channel(in[x].b, out[x].b, in[x].a); > > + struct pixel_argb_u16 *out = &output_buffer->pixels[x_start]; > > + const struct pixel_argb_u16 *in = stage_buffer->pixels; > > + > > + for (int i = 0; i < pixel_count; i++) { > > + out[i].a = (u16)0xffff; > > + out[i].r = pre_mul_blend_channel(in[i].r, out[i].r, in[i].a); > > + out[i].g = pre_mul_blend_channel(in[i].g, out[i].g, in[i].a); > > + out[i].b = pre_mul_blend_channel(in[i].b, out[i].b, in[i].a); > > } > > } > > > > @@ -183,7 +179,7 @@ static void blend(struct vkms_writeback_job *wb, > > { > > struct vkms_plane_state **plane = crtc_state->active_planes; > > u32 n_active_planes = crtc_state->num_active_planes; > > - int y_pos; > > + int y_pos, x_dst, x_limit; > > > > const struct pixel_argb_u16 background_color = { .a = 0xffff }; > > > > @@ -201,14 +197,16 @@ static void blend(struct vkms_writeback_job *wb, > > > > /* The active planes are composed associatively in z-order. */ > > for (size_t i = 0; i < n_active_planes; i++) { > > + x_dst = plane[i]->frame_info->dst.x1; > > + x_limit = min_t(size_t, drm_rect_width(&plane[i]->frame_info->dst), > > + stage_buffer->n_pixels); > > Are those input values to min_t() really of type size_t? Or why is > size_t here? n_pixel is size_t, drm_rect_width is int. I will change everything to int. Is there a way to ask the compiler "please don't do implicit conversion and report them as warn/errors"? > > y_pos = get_y_pos(plane[i]->frame_info, y); > > > > if (!check_limit(plane[i]->frame_info, y_pos)) > > continue; > > > > vkms_compose_row(stage_buffer, plane[i], y_pos); > > - pre_mul_alpha_blend(plane[i]->frame_info, stage_buffer, > > - output_buffer); > > + pre_mul_alpha_blend(stage_buffer, output_buffer, x_dst, x_limit); > > I thought it was a count, not a limit? > > "Limit" sounds to me like "end", and end - start = count. It is effectively a pixel count. I just took those naming from the original pre_mul_alpha_blend. I will change it to pixel_count. Thanks, Louis Chauvet > > } > > > > apply_lut(crtc_state, output_buffer); > > > > The details aside, this is a good move. > > > Thanks, > pq -- Louis Chauvet, Bootlin Embedded Linux and Kernel engineering https://bootlin.com