From patchwork Thu Oct 31 17:53:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Louis Chauvet X-Patchwork-Id: 13858259 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AB2E5D767F5 for ; Thu, 31 Oct 2024 17:54:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 081F410E42A; Thu, 31 Oct 2024 17:54:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="O6KOZ4la"; dkim-atps=neutral Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9983210E427 for ; Thu, 31 Oct 2024 17:53:49 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1A529E000C; Thu, 31 Oct 2024 17:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397228; 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=6ZpaJbV2bNMVRyQmeRVm1HrfbJ9sX9O5kIMloFrDM0s=; b=O6KOZ4lajDUo11WBRi1lTbeKVuFAacGtwpX20nWXFYg8iCjZY1JFR5sDZSlCyqlNksQdiw YNOHDmR9Qo5NR/lf7luocOwhoLPhhRnadnRVCxy6QTCDIh7WJT+81n0+6L1boEdtXFemOO yblTruSgCmRHU1chMZSskju9V79ND2BXaLloRVFs+Yd6dNv6fYwclac8munoSJH1w50wzE 8XWuoz757gilpONSUgdIJT2c6U9gSv/I+SFXURJ9rFYPyqkkt8B+x3yn0H+63m2onh55EV QuQDv2NoGa/Sf+t1wY6xmJDEnlH+52JO8cWatczqzDMs1IoBzp9EZLAD1gqI2w== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:31 +0100 Subject: [PATCH v13 7/9] drm/vkms: Introduce pixel_read_direction enum MIME-Version: 1.0 Message-Id: <20241031-yuv-v13-7-bd5463126faa@bootlin.com> References: <20241031-yuv-v13-0-bd5463126faa@bootlin.com> In-Reply-To: <20241031-yuv-v13-0-bd5463126faa@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 , Helen Koike , 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 X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=5214; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=jtnQPYmraR91F1KxrEvc/jaZ4vMp0evQSPda1XffPS0=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8QdwLRnGKJ9Lt4uw/SHL/P1Aw1hzMBUyM2hc A8oiYlu1heJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEHQAKCRAgrS7GWxAs 4rQeEACJg3CEr/uSn6n8VwEoLu14T4QJNYUWie6uX98+Bhbeps4YxC52y7SigPO3v10uOwq7pFW 5iiKA3xrXF9Xzshy7rlxZy38YQ9BVjjtEJcbG0eI2DEZP01e2mJgSeByBUitEgoo1LuoG3OTH1I RLIi39q0BmZqZ0p57JEHVoPsSxMD12leKOnTHdER3QFqAtvhB1V8CZSUKUDa0vI/TAJaQPxUAIk WVzpimDiR0gmVPdDMaOt8McYr7YtbnB8pF+tUoxS3aSpXJMplAtUgrSHkcwCXdbh6IFJvI99Wbq LpfgxF8m/v2L6gAvWZbvtrSRCCWp13q2dND4jh4Ca8QWWd6QH7tHuS2nD3XC0HIL+MOsKKOLvOB nbXS5xC1Mmg2vJgUw4XDwNJ12g4jFdGxGl042lVzfR+9WDOCt1bkZLVvG6pIuwTwtYgwauTDIgj 39BPGvO3Kvjt9fp5M7ouGtGIt4EgAVPhS8ixmiwfEzZhm+ESIVcUZFfPikrzKWYKPncYY/GnOEK Vj04DY+WBJwbSBH00R+IgLGDTf+2qhcmlC5QrQIpTVRMfN7Lw+aJszLXHNQAFdWZT1wQ3p+zeTf aItIJ68dtL2qVy1GeEjO1DJz4zBs1GjglA0rjhR2KKpmVHuxRZtPpB/u729Z9PAkAhqyG90hz11 79bIDM6eQy/H5cw== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The pixel_read_direction enum is useful to describe the reading direction in a plane. It avoids using the rotation property of DRM, which not practical to know the direction of reading. This patch also introduce two helpers, one to compute the pixel_read_direction from the DRM rotation property, and one to compute the step, in byte, between two successive pixel in a specific direction. Acked-by: Maíra Canal Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_composer.c | 44 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_drv.h | 11 +++++++++ drivers/gpu/drm/vkms/vkms_formats.c | 32 ++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index ecac0bc858a0..601e33431b45 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -159,6 +159,50 @@ static void apply_lut(const struct vkms_crtc_state *crtc_state, struct line_buff } } +/** + * direction_for_rotation() - Get the correct reading direction for a given rotation + * + * @rotation: Rotation to analyze. It correspond the field @frame_info.rotation. + * + * This function will use the @rotation setting of a source plane to compute the reading + * direction in this plane which correspond to a "left to right writing" in the CRTC. + * For example, if the buffer is reflected on X axis, the pixel must be read from right to left + * to be written from left to right on the CRTC. + */ +static enum pixel_read_direction direction_for_rotation(unsigned int rotation) +{ + struct drm_rect tmp_a, tmp_b; + int x, y; + + /* + * Points A and B are depicted as zero-size rectangles on the CRTC. + * The CRTC writing direction is from A to B. The plane reading direction + * is discovered by inverse-transforming A and B. + * The reading direction is computed by rotating the vector AB (top-left to top-right) in a + * 1x1 square. + */ + + tmp_a = DRM_RECT_INIT(0, 0, 0, 0); + tmp_b = DRM_RECT_INIT(1, 0, 0, 0); + drm_rect_rotate_inv(&tmp_a, 1, 1, rotation); + drm_rect_rotate_inv(&tmp_b, 1, 1, rotation); + + x = tmp_b.x1 - tmp_a.x1; + y = tmp_b.y1 - tmp_a.y1; + + if (x == 1 && y == 0) + return READ_LEFT_TO_RIGHT; + else if (x == -1 && y == 0) + return READ_RIGHT_TO_LEFT; + else if (y == 1 && x == 0) + return READ_TOP_TO_BOTTOM; + else if (y == -1 && x == 0) + return READ_BOTTOM_TO_TOP; + + WARN_ONCE(true, "The inverse of the rotation gives an incorrect direction."); + return READ_LEFT_TO_RIGHT; +} + /** * blend - blend the pixels from all planes and compute crc * @wb: The writeback frame buffer metadata diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 3f45290a0c5d..777b7bd91f27 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -69,6 +69,17 @@ struct vkms_writeback_job { pixel_write_t pixel_write; }; +/** + * enum pixel_read_direction - Enum used internaly by VKMS to represent a reading direction in a + * plane. + */ +enum pixel_read_direction { + READ_BOTTOM_TO_TOP, + READ_TOP_TO_BOTTOM, + READ_RIGHT_TO_LEFT, + READ_LEFT_TO_RIGHT +}; + /** * typedef pixel_read_t - These functions are used to read a pixel in the source frame, * convert it to `struct pixel_argb_u16` and write it to @out_pixel. diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c index 7f932d42394d..d0e7dfc1f0d3 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -79,6 +79,38 @@ static void packed_pixels_addr(const struct vkms_frame_info *frame_info, *addr = (u8 *)frame_info->map[0].vaddr + offset; } +/** + * get_block_step_bytes() - Common helper to compute the correct step value between each pixel block + * to read in a certain direction. + * + * @fb: Framebuffer to iter on + * @direction: Direction of the reading + * @plane_index: Plane to get the step from + * + * As the returned count is the number of bytes between two consecutive blocks in a direction, + * the caller may have to read multiple pixels before using the next one (for example, to read from + * left to right in a DRM_FORMAT_R1 plane, each block contains 8 pixels, so the step must be used + * only every 8 pixels). + */ +static int get_block_step_bytes(struct drm_framebuffer *fb, enum pixel_read_direction direction, + int plane_index) +{ + switch (direction) { + case READ_LEFT_TO_RIGHT: + return fb->format->char_per_block[plane_index]; + case READ_RIGHT_TO_LEFT: + return -fb->format->char_per_block[plane_index]; + case READ_TOP_TO_BOTTOM: + return (int)fb->pitches[plane_index] * drm_format_info_block_width(fb->format, + plane_index); + case READ_BOTTOM_TO_TOP: + return -(int)fb->pitches[plane_index] * drm_format_info_block_width(fb->format, + plane_index); + } + + return 0; +} + /** * packed_pixels_addr_1x1() - Get the pointer to the block containing the pixel at the given * coordinates