From nobody Thu Nov 28 20:03:37 2024 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) (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 6D9B5199930; Mon, 30 Sep 2024 15:32:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727710362; cv=none; b=YK0sSXaLmuaHhHA3J6ZDnu8A7utXc1PJCFRPw3OqdAW3jMjeK80CxPHhTp2kLGTP5//OtMhBjIzccTCk9B317GwkKvBksbVKi+CUCV8CbbR9bFk7BHos4INTPZzF3SLd28NC5EEUdIDJUEjznBYwDWYRgj6TUFsLSqkB2H5SptE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727710362; c=relaxed/simple; bh=r2/XngenrNzJPC8UuP2Lk3h2Erls9ge8Xk7h7YOWlsc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KpdeLVO4FLMsZ87Uaujbz4m8gbsKOrR5ZIBaerQnuKTaWfSOfh8mxpMd7CrGO7BURq8J/ywa68q9G0e1V527+Gq5l95FPjI/e79e+ENPmxihgg5CNh0vdnerltgT1nlElifdW7WEjhyJeNvvwNNgoSogrZDO1GB6XtSowU4+ewU= 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=hzWiI7Z9; arc=none smtp.client-ip=217.70.183.194 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="hzWiI7Z9" Received: by mail.gandi.net (Postfix) with ESMTPSA id 014A240005; Mon, 30 Sep 2024 15:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1727710358; 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=HYxQHT0hznL90lhhiFvano2jVpncd0wNCg9mS2aefmo=; b=hzWiI7Z9iEnwjY/DlJlwFlR2pN4SZCnr0rmMym0CkP3hMKyGUcrf5NtnyJvW06icLhs07/ NAYt5F24U6IAYTfR9GNooONDimURf1T1I5L50nlFNCw3DUOohZVmJ8HlQNSC9SGtTvv0SK dSHRXkCuSP8pZWQ73Gb6UkhGFvU93OOu8nk2fBE5pwS5xSaeBHiABOLm72A9AMlJoG1YJZ +VlCMGSt+Z6p2soLrPikC3/juQS9PDnYd50Os6wncyoq46wgf/iR8dcBUMPcY0QNog3+hc xTYaa8V3nK29hvNqMkzfA5/5f5xWCPVZBcCDYutUjZWcBbj87BXGfM4FoR8Adw== From: Louis Chauvet Date: Mon, 30 Sep 2024 17:31:46 +0200 Subject: [PATCH v11 06/15] drm/vkms: Avoid computing blending limits inside pre_mul_alpha_blend 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="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240930-yuv-v11-6-4b1a26bcfc96@bootlin.com> References: <20240930-yuv-v11-0-4b1a26bcfc96@bootlin.com> In-Reply-To: <20240930-yuv-v11-0-4b1a26bcfc96@bootlin.com> To: Rodrigo Siqueira , Melissa Wen , =?utf-8?q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Jonathan Corbet , Louis Chauvet , Simona Vetter , rdunlap@infradead.org, arthurgrillo@riseup.net, pekka.paalanen@haloniitty.fi, Simona Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, thomas.petazzoni@bootlin.com, jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com, seanpaul@google.com, marcheu@google.com, nicolejadeyee@google.com, Pekka Paalanen X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4075; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=r2/XngenrNzJPC8UuP2Lk3h2Erls9ge8Xk7h7YOWlsc=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBm+sRupNVSNrTrDQDeULOhRsvfoLPoDbOks911p hSc3DcNjGOJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZvrEbgAKCRAgrS7GWxAs 4urfEACIeW8VqNzR2toAFQiKbAAGYvf7oYupQ0huQpcW4fyNcxqztO271jxdGmYE0sNDsWIVN0u WeBY4D1RObmNh6DfZF2xqtgYvOMVtblyuJwssrYSzn5DbXffbwHQ8mmX5+0JvpEmfsNYdHxOb/I 8xZSnyMZQ/X+bOMRvv/42rTKUMb+xRbbwa75fCH8amzrdULH8+ykABYvBGPTgh010JN7Jyd9km6 H6mt/sN77omBaRDgAUIDNimnx7ACKqHE+VTSYqMi8MZhc/sSKWbjUru7IwnqffqslUVXflvR8kE 9uDTGyJwV1uwhj7AYwDXJm5/azKhoUHDpQtse2aDW3eDYIgq6JCRv/Ee5+K7Pr3+1Gujm6ir4iD bSbWUim4Cex3VxIW1fNk01dUNVjvKZ35wEcj/i2hIqJi+tpLY3adeued6ZS7eLc4EVA42VuTnbW hTVIKQ5rxbCaU+5CLAZQkdq/SK/s45PwCSyGNHdWSTAOjrHvZnoOdAZ2RJhU19KGx0uCRa8Zdzy ZpklidUxRYXgjPWBAztBYbCfiSW5UPMV06iASK9+PsZB2+3rDDtVWuZo1G1AoDBmLlAzDt5LzJo B0jvmBGFtEiwDM4WEXv5ru+aOPFpgPJ6Qh3jLebsWkMv0nslasrcUhe5culUYgTuN5UbkA/1Ep3 JyrhL81EF0ceS3g== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com 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`. Reviewed-by: Pekka Paalanen 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/vk= ms_composer.c index 931e214b225c..4d220bbb023c 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) =20 /** * 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 + * @pixel_count: The number of pixels to blend * - * 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. + * The pixels 0..@pixel_count in stage_buffer are blended at @x_start..@x_= start+@pixel_count in + * output_buffer. * * 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 =3D frame_info->dst.x1; - struct pixel_argb_u16 *out =3D output_buffer->pixels + x_dst; - struct pixel_argb_u16 *in =3D stage_buffer->pixels; - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - stage_buffer->n_pixels); - - for (int x =3D 0; x < x_limit; x++) { - out[x].a =3D (u16)0xffff; - out[x].r =3D pre_mul_blend_channel(in[x].r, out[x].r, in[x].a); - out[x].g =3D pre_mul_blend_channel(in[x].g, out[x].g, in[x].a); - out[x].b =3D pre_mul_blend_channel(in[x].b, out[x].b, in[x].a); + struct pixel_argb_u16 *out =3D &output_buffer->pixels[x_start]; + const struct pixel_argb_u16 *in =3D stage_buffer->pixels; + + for (int i =3D 0; i < pixel_count; i++) { + out[i].a =3D (u16)0xffff; + out[i].r =3D pre_mul_blend_channel(in[i].r, out[i].r, in[i].a); + out[i].g =3D pre_mul_blend_channel(in[i].g, out[i].g, in[i].a); + out[i].b =3D pre_mul_blend_channel(in[i].b, out[i].b, in[i].a); } } =20 @@ -183,7 +179,7 @@ static void blend(struct vkms_writeback_job *wb, { struct vkms_plane_state **plane =3D crtc_state->active_planes; u32 n_active_planes =3D crtc_state->num_active_planes; - int y_pos; + int y_pos, x_dst, pixel_count; =20 const struct pixel_argb_u16 background_color =3D { .a =3D 0xffff }; =20 @@ -201,14 +197,16 @@ static void blend(struct vkms_writeback_job *wb, =20 /* The active planes are composed associatively in z-order. */ for (size_t i =3D 0; i < n_active_planes; i++) { + x_dst =3D plane[i]->frame_info->dst.x1; + pixel_count =3D min_t(int, drm_rect_width(&plane[i]->frame_info->dst), + (int)stage_buffer->n_pixels); y_pos =3D get_y_pos(plane[i]->frame_info, y); =20 if (!check_limit(plane[i]->frame_info, y_pos)) continue; =20 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, pixel_count); } =20 apply_lut(crtc_state, output_buffer); --=20 2.46.2