From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 BBE8B1BFDEC; Thu, 31 Oct 2024 17:53:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397225; cv=none; b=OWyBwomAdkekVZdQt5pvHMh+BguRNt7hj94qbRB7W9YaiI0P8cnuvKS8H13K5eneYBrVVgZ5RXQawr78cbMjkF1rD4pK/DSgIhOg903QeK6Ogs/KiJ1csi7yHJCQSd077WsAn4PDg4dq3/SwwuWRPZiLxA+hbilokNFlt/4f+YY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397225; c=relaxed/simple; bh=+UNcxZgMXrYbfQ0Wk9GKtPGOAGGqTYaVl8i/PMhH4u4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DyTm8z6wBHXnkdR533+5RcT3tLAD71R1aQhGToFGO0hi1whrgrEfqJgUFgD9SuaF1rCeiJeqmEnPccEq01hAKWB2GQppb6crdieZs5fp0b1UPYxoMCteexeHSTwK6UebHUB2GmhZKgK/AGlzWzqyIk0AKz9UnvDgkkMLjITrF1I= 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=JXbQ7+fH; arc=none smtp.client-ip=217.70.183.196 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="JXbQ7+fH" Received: by mail.gandi.net (Postfix) with ESMTPSA id 0C4C1E0004; Thu, 31 Oct 2024 17:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397220; 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=nPw90jBWzUneCJNYVnnpD4jiAcd/VX1BxcTgAriuwkw=; b=JXbQ7+fHk3DMA3kBGlKtvnotuatUHPN2AB+xkDUmpHpvpZtgoT9pJHNANItIYwyB22liAo UqbbPISD4mZaol59zPxIYZSV2iOIxkoVxo77Uf0e7p63NomDs5yO5azhqpnFFk8WRtGtNG e+ixKblgW7vEpVlbX0FEjtUl0mmsnIvltOznaQYm6rrGcHl/86WfH3cloS6BH/Wz7naRvA AiM9PbbAAXOxYmsgJ+CR/okrXtwRu69La+6D65fI71l/AtWaQziHNr9v5OgWDxf7JxWDu5 C7KGRx9sv08wwo1gQjdJ81zyKw3ZdkcWWZX+0MZq6Pnkhzn5RBZN2USYV0PqpQ== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:25 +0100 Subject: [PATCH v13 1/9] drm/vkms: Code formatting 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: <20241031-yuv-v13-1-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, Pekka Paalanen , =?utf-8?q?Ma=C3=ADra_Canal?= X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4941; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=+UNcxZgMXrYbfQ0Wk9GKtPGOAGGqTYaVl8i/PMhH4u4=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8QbO6//f1X5+HAiouby0mxlRwWNBb9rgZlRs rNAosVqUTGJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEGwAKCRAgrS7GWxAs 4h+cEAC+FMQ2S5fLDcIIhh5hSPwuVpYSOt3Gi3m4YqFr1g0kKumHCYwN0WJCcCigI3d6lBDNn37 LT1Sr9iFED/i995GE/bT+EkZs5rcjVQULGuGiZGIzDX97SpDF4bOIujJCXtF2TPeHJqusCI3k2r kDbCtVd4GpQcdBCDeLoGvCs/TWjBWOeUVORBmjyqfMJ2dIPn1Xe9q8PNJNvO/mP4sUo6vmHXhxW N+tz7yl97LPdlwuy8ZIF8M/0kheUJiN6QHjC/Vf/w/ZzR7NpKjH/PrxiGdmJK+qY8SciBS2nMKQ c8FS4e25oYZwZHbnP1cSWV6hpjG2iyZ+/Zm7Zwo3HXFhe+95uNtYJx++W9QLCCEHCNmMBExaqzD 0H1CukynLm7ujTjA6DagbPHRgsSiMvPCblLQwL+9g6GsCiH6MhUsB1Q5UFIfyjuS1VLc6ItCpmB RCxZj7w50OzZcjcU6uvo+4qrg51CTeGAwZqFnFiV9jm8gW7UwkNvWI3M7H8Nk1/06cGUpD+IFlk c6HdjYX7N3ODlnRPdl8CbNQTmvi7yRm7hhvlAQpvM5rCqITWWzAc21vUQd7HXWCpoU0egDD2tN6 EtkYEDMOvRe/FJDcWFPSowKhaJVFN5EaNS1oaIjSNwS1NoT8+VMNbiGVaKuiE/Q79WXLlERwi9H 7/VM6kvFD1dfQVg== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com Few no-op changes to remove double spaces and fix wrong alignments. Reviewed-by: Pekka Paalanen Reviewed-by: Ma=C3=ADra Canal Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_composer.c | 10 +++++----- drivers/gpu/drm/vkms/vkms_crtc.c | 6 ++---- drivers/gpu/drm/vkms/vkms_drv.c | 3 +-- drivers/gpu/drm/vkms/vkms_plane.c | 8 ++++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index 57a5769fc994..931e214b225c 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -96,7 +96,7 @@ static u16 lerp_u16(u16 a, u16 b, s64 t) s64 a_fp =3D drm_int2fixp(a); s64 b_fp =3D drm_int2fixp(b); =20 - s64 delta =3D drm_fixp_mul(b_fp - a_fp, t); + s64 delta =3D drm_fixp_mul(b_fp - a_fp, t); =20 return drm_fixp2int(a_fp + delta); } @@ -309,8 +309,8 @@ static int compose_active_planes(struct vkms_writeback_= job *active_wb, void vkms_composer_worker(struct work_struct *work) { struct vkms_crtc_state *crtc_state =3D container_of(work, - struct vkms_crtc_state, - composer_work); + struct vkms_crtc_state, + composer_work); struct drm_crtc *crtc =3D crtc_state->base.crtc; struct vkms_writeback_job *active_wb =3D crtc_state->active_writeback; struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); @@ -335,7 +335,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state->gamma_lut.base =3D (struct drm_color_lut *)crtc->state->gamm= a_lut->data; crtc_state->gamma_lut.lut_length =3D crtc->state->gamma_lut->length / sizeof(struct drm_color_lut); - max_lut_index_fp =3D drm_int2fixp(crtc_state->gamma_lut.lut_length - 1); + max_lut_index_fp =3D drm_int2fixp(crtc_state->gamma_lut.lut_length - 1); crtc_state->gamma_lut.channel_value2index_ratio =3D drm_fixp_div(max_lut= _index_fp, u16_max_fp); =20 @@ -374,7 +374,7 @@ void vkms_composer_worker(struct work_struct *work) drm_crtc_add_crc_entry(crtc, true, frame_start++, &crc32); } =20 -static const char * const pipe_crc_sources[] =3D {"auto"}; +static const char *const pipe_crc_sources[] =3D { "auto" }; =20 const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, size_t *count) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index a40295c18b48..39bf9d4247fa 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -188,8 +188,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc, return ret; =20 drm_for_each_plane_mask(plane, crtc->dev, crtc_state->plane_mask) { - plane_state =3D drm_atomic_get_existing_plane_state(crtc_state->state, - plane); + plane_state =3D drm_atomic_get_existing_plane_state(crtc_state->state, p= lane); WARN_ON(!plane_state); =20 if (!plane_state->visible) @@ -205,8 +204,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc, =20 i =3D 0; drm_for_each_plane_mask(plane, crtc->dev, crtc_state->plane_mask) { - plane_state =3D drm_atomic_get_existing_plane_state(crtc_state->state, - plane); + plane_state =3D drm_atomic_get_existing_plane_state(crtc_state->state, p= lane); =20 if (!plane_state->visible) continue; diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 2d1e95cb66e5..19b7322ce49d 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -82,8 +82,7 @@ static void vkms_atomic_commit_tail(struct drm_atomic_sta= te *old_state) drm_atomic_helper_wait_for_flip_done(dev, old_state); =20 for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) { - struct vkms_crtc_state *vkms_state =3D - to_vkms_crtc_state(old_crtc_state); + struct vkms_crtc_state *vkms_state =3D to_vkms_crtc_state(old_crtc_state= ); =20 flush_work(&vkms_state->composer_work); } diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index e5c625ab8e3e..5a8d295e65f2 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -117,10 +117,10 @@ static void vkms_plane_atomic_update(struct drm_plane= *plane, memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->ma= p)); drm_framebuffer_get(frame_info->fb); frame_info->rotation =3D drm_rotation_simplify(new_state->rotation, DRM_M= ODE_ROTATE_0 | - DRM_MODE_ROTATE_90 | - DRM_MODE_ROTATE_270 | - DRM_MODE_REFLECT_X | - DRM_MODE_REFLECT_Y); + DRM_MODE_ROTATE_90 | + DRM_MODE_ROTATE_270 | + DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y); =20 drm_rect_rotate(&frame_info->rotated, drm_rect_width(&frame_info->rotated= ), drm_rect_height(&frame_info->rotated), frame_info->rotation); --=20 2.46.2 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 DA93C1C2456; Thu, 31 Oct 2024 17:53:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397227; cv=none; b=eAUQ2qHGiFQzBSFCppo61RXUkG2z2ClWgcNlrwLfhAnxvoRMhUpEEEKl/7M9CFOIfey0cjXLVWpyUISvv4Qo3iTQ00aOb5LJTci3rcRA0iwiBwA7nN1isvbzAHAg7KtJ/ld4AlMQaL8hPXIX+i36O31uTDzVi528N8LzdIniWh8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397227; c=relaxed/simple; bh=ZCZchl8YXaJKXMTOIfi3f6uTp8wXE1eZQ6XB+/K8JTg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iaa8OTWi4iGo8wgGNJAe2oywzEEmUGZj5F83aOWdyT3OfdwL0gpwzQ25WOV7x835wcWjdRIRZPth4aVjWfQkzhVVnA2L3eHMnXYgJTNDH+8d6nc3TC619FMVoWfRuVgjmWgin+CTMpIrsMvphydOTyjt8FY9KFfBzYZrcmueflo= 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=eIOda2j+; arc=none smtp.client-ip=217.70.183.196 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="eIOda2j+" Received: by mail.gandi.net (Postfix) with ESMTPSA id 618ADE0008; Thu, 31 Oct 2024 17:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397221; 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=2C5hZ/knWBtoOPrBC9CFpCsHQ2ytwSQQLFNkYLaAoVE=; b=eIOda2j+WUz1/YWOCruoHf+odDqpiSaeXy+aw00u1N1cgxvrnKdYNLQUIvoxu4QJJDSCKV GZWtHCCORnkrMmzImGrfOq9E3wINMHkvJBZWHbGuUNh/9cjGVHodKcPG9TaVQ/h6qc8NYQ ZbikAhTg4EGUmHP7dF8jhfyw24uo0JWq4IIA11VkaV7O/9NbiijzRGuBuPeJk17Ne1Kxp/ AZLhxO6sz7m7n19Y96DgHsf5s9kiAk0zmx27fZMCYmxdGyvsWjO/O4M3l2NeQgDX3bR6hk cZdxSWrKqTatWoXI+rDYswsohGLNDBm9BZGVg/QapVHTBeFq/LGiKW88NJDIEA== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:26 +0100 Subject: [PATCH v13 2/9] drm/vkms: Use drm_frame directly 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: <20241031-yuv-v13-2-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, Pekka Paalanen , =?utf-8?q?Ma=C3=ADra_Canal?= X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4276; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=2sG3hL92AI5p05ggDfRLdPBFv95vU35OetchXGlRuB8=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8QbfDCE1J1xM7MwxmmmIDsYzale28q48CZVK 9qw2KDWk4WJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEGwAKCRAgrS7GWxAs 4tlkD/46xbqzahEYqk1cpthlYEXtfN4LdvpgUmkWCiJVZtkxOW/AwayipiaumZs0IDDTxmwe4Xd k1uDIOSzNXxFz7o6KU1e9dTyXSrB4KQU17QLPEmOZ1YjjuA06eTaKw6V2INDa6oSabI350n8elJ lsUwOR68HTtQGXOufv+ugh74+xjMjrVGfOB+0uhXjzeo8V9m09g0GmB3CWgNGNj4gS0s3nP/0Sl wNFbghbF9mHe0nca+IKTjwDj4VUW9a5hwZPQQGwmLYpzlganbP/T2ppJFntR/b+I/UjgzjO0yrf GOLlV89hwJGQ31BvgOWJnlXUWXJ8KAGdiKdqna6O71wlqRZSdDSV+8XCCRF4BCaQIjlM5c8Ul1+ DZ08Yp5cCDPQ4Jgt4p/eekzCAkEH9pPiOa9XyPXy/d7AkcToay9omR8+4wzW9rylnbggC88h8Uk a2d8a/JEmVGNZ/jpo4zBTS9tOcFwyLCV2qHtT3YB5EL6vnVd3OixRKaf3XiAc3pEfUXwxufq9JJ Jd+2sEPcXoRj9FslFQJ9rBEJNQOwFUWQX4tvBIRM4X9iBd8RM7TZdCZ/tX+G7Fi8eDmOFsLeklZ Gj1ukKeCt8cL0Mn8tbFkFMP8xmbJiMPUjGnp/z/Uq54uTw6g7bK2464IlJEI7aDaout2e+d2sV0 JNtZ8iB8KkSIGCw== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com From: Arthur Grillo Remove intermidiary variables and access the variables directly from drm_frame. These changes should be noop. Signed-off-by: Arthur Grillo Acked-by: Pekka Paalanen Reviewed-by: Ma=C3=ADra Canal Reviewed-by: Louis Chauvet [Louis Chauvet: Applied review from Ma=C3=ADra] Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_drv.h | 3 --- drivers/gpu/drm/vkms/vkms_formats.c | 11 ++++++----- drivers/gpu/drm/vkms/vkms_plane.c | 3 --- drivers/gpu/drm/vkms/vkms_writeback.c | 5 ----- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 672fe191e239..fcb5a5ff7df7 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -42,9 +42,6 @@ struct vkms_frame_info { struct drm_rect rotated; struct iosys_map map[DRM_FORMAT_MAX_PLANES]; unsigned int rotation; - unsigned int offset; - unsigned int pitch; - unsigned int cpp; }; =20 struct pixel_argb_u16 { diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index e8a5cc235ebb..2a0fbe27d8b2 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -23,8 +23,9 @@ */ static size_t pixel_offset(const struct vkms_frame_info *frame_info, int x= , int y) { - return frame_info->offset + (y * frame_info->pitch) - + (x * frame_info->cpp); + struct drm_framebuffer *fb =3D frame_info->fb; + + return fb->offsets[0] + (y * fb->pitches[0]) + (x * fb->format->cpp[0]); } =20 /** @@ -154,12 +155,12 @@ void vkms_compose_row(struct line_buffer *stage_buffe= r, struct vkms_plane_state u8 *src_pixels =3D get_packed_src_addr(frame_info, y); int limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), stage_buffe= r->n_pixels); =20 - for (size_t x =3D 0; x < limit; x++, src_pixels +=3D frame_info->cpp) { + for (size_t x =3D 0; x < limit; x++, src_pixels +=3D frame_info->fb->form= at->cpp[0]) { int x_pos =3D get_x_position(frame_info, limit, x); =20 if (drm_rotation_90_or_270(frame_info->rotation)) src_pixels =3D get_packed_src_addr(frame_info, x + frame_info->rotated.= y1) - + frame_info->cpp * y; + + frame_info->fb->format->cpp[0] * y; =20 plane->pixel_read(src_pixels, &out_pixels[x_pos]); } @@ -253,7 +254,7 @@ void vkms_writeback_row(struct vkms_writeback_job *wb, struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), src_buffe= r->n_pixels); =20 - for (size_t x =3D 0; x < x_limit; x++, dst_pixels +=3D frame_info->cpp) + for (size_t x =3D 0; x < x_limit; x++, dst_pixels +=3D frame_info->fb->fo= rmat->cpp[0]) wb->pixel_write(dst_pixels, &in_pixels[x]); } =20 diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index 5a8d295e65f2..21b5adfb44aa 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -125,9 +125,6 @@ static void vkms_plane_atomic_update(struct drm_plane *= plane, drm_rect_rotate(&frame_info->rotated, drm_rect_width(&frame_info->rotated= ), drm_rect_height(&frame_info->rotated), frame_info->rotation); =20 - frame_info->offset =3D fb->offsets[0]; - frame_info->pitch =3D fb->pitches[0]; - frame_info->cpp =3D fb->format->cpp[0]; vkms_plane_state->pixel_read =3D get_pixel_conversion_function(fmt); } =20 diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index bc724cbd5e3a..c8582df1f739 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -149,11 +149,6 @@ static void vkms_wb_atomic_commit(struct drm_connector= *conn, crtc_state->active_writeback =3D active_wb; crtc_state->wb_pending =3D true; spin_unlock_irq(&output->composer_lock); - - wb_frame_info->offset =3D fb->offsets[0]; - wb_frame_info->pitch =3D fb->pitches[0]; - wb_frame_info->cpp =3D fb->format->cpp[0]; - drm_writeback_queue_job(wb_conn, connector_state); active_wb->pixel_write =3D get_pixel_write_function(wb_format); drm_rect_init(&wb_frame_info->src, 0, 0, crtc_width, crtc_height); --=20 2.46.2 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 D7EC91C2443; Thu, 31 Oct 2024 17:53:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397228; cv=none; b=QUmCjAUpDk4BX4QRpwtOCRISmVVYFBzlt0RVemRlzm7zlxQNjMJauabMLTohjLViuEgbkrayu80APwmRodBpk5/I4WQZthznsCHcY/Q88NtonOW6+hCRJQkjT9acSyL22fzPzvxBiFOKqWfM4Kkx0IouHSpPcCYH1ctVxRvGw50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397228; c=relaxed/simple; bh=W6FmTSZbFCzM56Glzlm65mtmYDj+QUzKBDMqD0/Hjw4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=opJak9BQbY9k3awLO8YvVHKhAkCBhq9z/ySLBDGZKNHI+YBYsmANz+EurkbGNPo4xRLCz2KGJv6EWAAObDYQBsyr1lug0tsbZmaSFv0wX3K7aduVaNeNcBoScVQrlY+qee6ODgQDXkwfXnM/tH4axVgRK76PY26wWAon5Fazdkg= 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=hrjojzcQ; arc=none smtp.client-ip=217.70.183.196 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="hrjojzcQ" Received: by mail.gandi.net (Postfix) with ESMTPSA id BECE2E0006; Thu, 31 Oct 2024 17:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397223; 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=/rit4R7BfGzJp+BsDcAO2abNMYF5FXKvgrXhAznsmVw=; b=hrjojzcQ0Gc061OmKu6jU4I3sJFUhWbPM/WCJx37ePidLB8yK43HnBC5txsuHigZjHDBCb qY5BLDmQsKZcbdc/bOWsFLJNA0BTlxB4P17DfyejWPVhZyM/jc+kuuuULNyI3rwuFNclKn HuinMLVaDG0+y9OAF9AnElO9zbsRf40N4F9g6yLAI3ByH9yFORW/GBiE0JdxAf1batJtZk 9IAKv8A0PBc8ypv/bQLaGPNvkqxqkNG2Dze3TrIBnRieETwfJ0OxGUrzhZo5orO2TXz6wF FCcnJ0zSHLMLd9xndnghONm8ep1EYF4SWS/jBCQ9+PiqfHbGzTSS9XDef/kmZA== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:27 +0100 Subject: [PATCH v13 3/9] drm/vkms: Add typedef and documentation for pixel_read and pixel_write functions 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: <20241031-yuv-v13-3-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, Pekka Paalanen X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=13183; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=W6FmTSZbFCzM56Glzlm65mtmYDj+QUzKBDMqD0/Hjw4=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8QbzlazyAsm8YAYqyoYM8aobcgaVYu6Y6lKy GP4FvxRnsiJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEGwAKCRAgrS7GWxAs 4pDbD/0daZ4z4ChFoFnA+1D9YdqCxPtvzRgkHb5hW09LfQ37iu3Tiojm4UwPjedhTQv+EacSkYz PD3QYUYS7TtPdvq+2zN83ghr2j+WvvvUbjVv+sRZKxh2XF6/MLotAj48mfgGQ0S+lfG0KWsXz2v 7jcnktEksza6Vj6m+GUwS4wS7FY8TLI4wTIfrdbOhHSaHWP5sJVEzuRYIP1Iiyp5hK0exSvPp4j rbFbqBlBFiOtuVlX09//sUda/NoPD7Ci0cjaGIqDAtyx4auu2pV0vizeOcFMimY6B5aj9CDZm8N 0AadI5CbyPGSLkozcG+N36zN4kR/GqVdIrfVUq8QyzRgB1trX4APmwLnQVekeNxWkSkWYl6Kn+1 yx0MkmSvVcEN7UXGi/qmYTPSncbFPEUSdasxHwJ79OyqiUecQn/uNXOyKzlPU/Z9kPY8d1uP8Do +Ai/w1NreV38zsj42pBuV3wbMp3lXmqLFhytY+xCB9trS+xAbiDG2LbgcLMDqEo1AGiYKeRNmh9 dRPUPhaF7C2WKDCKXciMD9hv6Q6k4LMi9c6vObrENirMsMT0CjOcPv3bBZS0sC4ff5PNX3AiUTQ 4J3o+at2t/PsE2hcXSGDBLy8ThDCmgQpg2Jn2yQ3YOmv4FV4K9jEUIlzB3YviYvPID2XJUMHB8D Nonnr5cBZRp/e5Q== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com Introduce two typedefs: pixel_read_t and pixel_write_t. It allows the compiler to check if the passed functions take the correct arguments. Such typedefs will help ensuring consistency across the code base in case of update of these prototypes. Rename input/output variable in a consistent way between read_line and write_line. A warn has been added in get_pixel_*_function to alert when an unsupported pixel format is requested. As those formats are checked before atomic_update callbacks, it should never happen. Document for those typedefs. Reviewed-by: Pekka Paalanen Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_drv.h | 23 ++++++- drivers/gpu/drm/vkms/vkms_formats.c | 124 ++++++++++++++++++++------------= ---- drivers/gpu/drm/vkms/vkms_formats.h | 4 +- drivers/gpu/drm/vkms/vkms_plane.c | 2 +- 4 files changed, 94 insertions(+), 59 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index fcb5a5ff7df7..e0d46defed83 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -53,12 +53,31 @@ struct line_buffer { struct pixel_argb_u16 *pixels; }; =20 +/** + * typedef pixel_write_t - These functions are used to read a pixel from a + * &struct pixel_argb_u16, convert it in a specific format and write it in= the @out_pixel + * buffer. + * + * @out_pixel: destination address to write the pixel + * @in_pixel: pixel to write + */ +typedef void (*pixel_write_t)(u8 *out_pixel, struct pixel_argb_u16 *in_pix= el); + struct vkms_writeback_job { struct iosys_map data[DRM_FORMAT_MAX_PLANES]; struct vkms_frame_info wb_frame_info; - void (*pixel_write)(u8 *dst_pixels, struct pixel_argb_u16 *in_pixel); + pixel_write_t pixel_write; }; =20 +/** + * 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. + * + * @in_pixel: pointer to the pixel to read + * @out_pixel: pointer to write the converted pixel + */ +typedef void (*pixel_read_t)(u8 *in_pixel, struct pixel_argb_u16 *out_pixe= l); + /** * struct vkms_plane_state - Driver specific plane state * @base: base plane state @@ -69,7 +88,7 @@ struct vkms_writeback_job { struct vkms_plane_state { struct drm_shadow_plane_state base; struct vkms_frame_info *frame_info; - void (*pixel_read)(u8 *src_buffer, struct pixel_argb_u16 *out_pixel); + pixel_read_t pixel_read; }; =20 struct vkms_plane { diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index 2a0fbe27d8b2..b9544e67cd4f 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -75,7 +75,7 @@ static int get_x_position(const struct vkms_frame_info *f= rame_info, int limit, i * They are used in the vkms_compose_row() function to handle multiple for= mats. */ =20 -static void ARGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *ou= t_pixel) +static void ARGB8888_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_= pixel) { /* * The 257 is the "conversion ratio". This number is obtained by the @@ -83,48 +83,48 @@ static void ARGB8888_to_argb_u16(u8 *src_pixels, struct= pixel_argb_u16 *out_pixe * the best color value in a pixel format with more possibilities. * A similar idea applies to others RGB color conversions. */ - out_pixel->a =3D (u16)src_pixels[3] * 257; - out_pixel->r =3D (u16)src_pixels[2] * 257; - out_pixel->g =3D (u16)src_pixels[1] * 257; - out_pixel->b =3D (u16)src_pixels[0] * 257; + out_pixel->a =3D (u16)in_pixel[3] * 257; + out_pixel->r =3D (u16)in_pixel[2] * 257; + out_pixel->g =3D (u16)in_pixel[1] * 257; + out_pixel->b =3D (u16)in_pixel[0] * 257; } =20 -static void XRGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *ou= t_pixel) +static void XRGB8888_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_= pixel) { out_pixel->a =3D (u16)0xffff; - out_pixel->r =3D (u16)src_pixels[2] * 257; - out_pixel->g =3D (u16)src_pixels[1] * 257; - out_pixel->b =3D (u16)src_pixels[0] * 257; + out_pixel->r =3D (u16)in_pixel[2] * 257; + out_pixel->g =3D (u16)in_pixel[1] * 257; + out_pixel->b =3D (u16)in_pixel[0] * 257; } =20 -static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16= *out_pixel) +static void ARGB16161616_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *= out_pixel) { - __le16 *pixels =3D (__force __le16 *)src_pixels; + __le16 *pixel =3D (__le16 *)in_pixel; =20 - out_pixel->a =3D le16_to_cpu(pixels[3]); - out_pixel->r =3D le16_to_cpu(pixels[2]); - out_pixel->g =3D le16_to_cpu(pixels[1]); - out_pixel->b =3D le16_to_cpu(pixels[0]); + out_pixel->a =3D le16_to_cpu(pixel[3]); + out_pixel->r =3D le16_to_cpu(pixel[2]); + out_pixel->g =3D le16_to_cpu(pixel[1]); + out_pixel->b =3D le16_to_cpu(pixel[0]); } =20 -static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16= *out_pixel) +static void XRGB16161616_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *= out_pixel) { - __le16 *pixels =3D (__force __le16 *)src_pixels; + __le16 *pixel =3D (__le16 *)in_pixel; =20 out_pixel->a =3D (u16)0xffff; - out_pixel->r =3D le16_to_cpu(pixels[2]); - out_pixel->g =3D le16_to_cpu(pixels[1]); - out_pixel->b =3D le16_to_cpu(pixels[0]); + out_pixel->r =3D le16_to_cpu(pixel[2]); + out_pixel->g =3D le16_to_cpu(pixel[1]); + out_pixel->b =3D le16_to_cpu(pixel[0]); } =20 -static void RGB565_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_= pixel) +static void RGB565_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_pi= xel) { - __le16 *pixels =3D (__force __le16 *)src_pixels; + __le16 *pixel =3D (__le16 *)in_pixel; =20 s64 fp_rb_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(31)); s64 fp_g_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(63)); =20 - u16 rgb_565 =3D le16_to_cpu(*pixels); + u16 rgb_565 =3D le16_to_cpu(*pixel); s64 fp_r =3D drm_int2fixp((rgb_565 >> 11) & 0x1f); s64 fp_g =3D drm_int2fixp((rgb_565 >> 5) & 0x3f); s64 fp_b =3D drm_int2fixp(rgb_565 & 0x1f); @@ -168,12 +168,12 @@ void vkms_compose_row(struct line_buffer *stage_buffe= r, struct vkms_plane_state =20 /* * The following functions take one &struct pixel_argb_u16 and convert it = to a specific format. - * The result is stored in @dst_pixels. + * The result is stored in @out_pixel. * * They are used in vkms_writeback_row() to convert and store a pixel from= the src_buffer to * the writeback buffer. */ -static void argb_u16_to_ARGB8888(u8 *dst_pixels, struct pixel_argb_u16 *in= _pixel) +static void argb_u16_to_ARGB8888(u8 *out_pixel, struct pixel_argb_u16 *in_= pixel) { /* * This sequence below is important because the format's byte order is @@ -185,43 +185,43 @@ static void argb_u16_to_ARGB8888(u8 *dst_pixels, stru= ct pixel_argb_u16 *in_pixel * | Addr + 2 | =3D Red channel * | Addr + 3 | =3D Alpha channel */ - dst_pixels[3] =3D DIV_ROUND_CLOSEST(in_pixel->a, 257); - dst_pixels[2] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); - dst_pixels[1] =3D DIV_ROUND_CLOSEST(in_pixel->g, 257); - dst_pixels[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); + out_pixel[3] =3D DIV_ROUND_CLOSEST(in_pixel->a, 257); + out_pixel[2] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); + out_pixel[1] =3D DIV_ROUND_CLOSEST(in_pixel->g, 257); + out_pixel[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); } =20 -static void argb_u16_to_XRGB8888(u8 *dst_pixels, struct pixel_argb_u16 *in= _pixel) +static void argb_u16_to_XRGB8888(u8 *out_pixel, struct pixel_argb_u16 *in_= pixel) { - dst_pixels[3] =3D 0xff; - dst_pixels[2] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); - dst_pixels[1] =3D DIV_ROUND_CLOSEST(in_pixel->g, 257); - dst_pixels[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); + out_pixel[3] =3D 0xff; + out_pixel[2] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); + out_pixel[1] =3D DIV_ROUND_CLOSEST(in_pixel->g, 257); + out_pixel[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); } =20 -static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16= *in_pixel) +static void argb_u16_to_ARGB16161616(u8 *out_pixel, struct pixel_argb_u16 = *in_pixel) { - __le16 *pixels =3D (__force __le16 *)dst_pixels; + __le16 *pixel =3D (__le16 *)out_pixel; =20 - pixels[3] =3D cpu_to_le16(in_pixel->a); - pixels[2] =3D cpu_to_le16(in_pixel->r); - pixels[1] =3D cpu_to_le16(in_pixel->g); - pixels[0] =3D cpu_to_le16(in_pixel->b); + pixel[3] =3D cpu_to_le16(in_pixel->a); + pixel[2] =3D cpu_to_le16(in_pixel->r); + pixel[1] =3D cpu_to_le16(in_pixel->g); + pixel[0] =3D cpu_to_le16(in_pixel->b); } =20 -static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16= *in_pixel) +static void argb_u16_to_XRGB16161616(u8 *out_pixel, struct pixel_argb_u16 = *in_pixel) { - __le16 *pixels =3D (__force __le16 *)dst_pixels; + __le16 *pixel =3D (__le16 *)out_pixel; =20 - pixels[3] =3D cpu_to_le16(0xffff); - pixels[2] =3D cpu_to_le16(in_pixel->r); - pixels[1] =3D cpu_to_le16(in_pixel->g); - pixels[0] =3D cpu_to_le16(in_pixel->b); + pixel[3] =3D cpu_to_le16(0xffff); + pixel[2] =3D cpu_to_le16(in_pixel->r); + pixel[1] =3D cpu_to_le16(in_pixel->g); + pixel[0] =3D cpu_to_le16(in_pixel->b); } =20 -static void argb_u16_to_RGB565(u8 *dst_pixels, struct pixel_argb_u16 *in_p= ixel) +static void argb_u16_to_RGB565(u8 *out_pixel, struct pixel_argb_u16 *in_pi= xel) { - __le16 *pixels =3D (__force __le16 *)dst_pixels; + __le16 *pixel =3D (__le16 *)out_pixel; =20 s64 fp_rb_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(31)); s64 fp_g_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(63)); @@ -234,7 +234,7 @@ static void argb_u16_to_RGB565(u8 *dst_pixels, struct p= ixel_argb_u16 *in_pixel) u16 g =3D drm_fixp2int(drm_fixp_div(fp_g, fp_g_ratio)); u16 b =3D drm_fixp2int(drm_fixp_div(fp_b, fp_rb_ratio)); =20 - *pixels =3D cpu_to_le16(r << 11 | g << 5 | b); + *pixel =3D cpu_to_le16(r << 11 | g << 5 | b); } =20 /** @@ -259,13 +259,13 @@ void vkms_writeback_row(struct vkms_writeback_job *wb, } =20 /** - * get_pixel_conversion_function() - Retrieve the correct read_pixel funct= ion for a specific + * get_pixel_read_function() - Retrieve the correct read_pixel function fo= r a specific * format. The returned pointer is NULL for unsupported pixel formats. The= caller must ensure that * the pointer is valid before using it in a vkms_plane_state. * * @format: DRM_FORMAT_* value for which to obtain a conversion function (= see [drm_fourcc.h]) */ -void *get_pixel_conversion_function(u32 format) +pixel_read_t get_pixel_read_function(u32 format) { switch (format) { case DRM_FORMAT_ARGB8888: @@ -279,7 +279,15 @@ void *get_pixel_conversion_function(u32 format) case DRM_FORMAT_RGB565: return &RGB565_to_argb_u16; default: - return NULL; + /* + * This is a bug in vkms_plane_atomic_check(). All the supported + * format must: + * - Be listed in vkms_formats in vkms_plane.c + * - Have a pixel_read callback defined here + */ + pr_err("Pixel format %p4cc is not supported by VKMS planes. This is a ke= rnel bug, atomic check must forbid this configuration.\n", + &format); + BUG(); } } =20 @@ -290,7 +298,7 @@ void *get_pixel_conversion_function(u32 format) * * @format: DRM_FORMAT_* value for which to obtain a conversion function (= see [drm_fourcc.h]) */ -void *get_pixel_write_function(u32 format) +pixel_write_t get_pixel_write_function(u32 format) { switch (format) { case DRM_FORMAT_ARGB8888: @@ -304,6 +312,14 @@ void *get_pixel_write_function(u32 format) case DRM_FORMAT_RGB565: return &argb_u16_to_RGB565; default: - return NULL; + /* + * This is a bug in vkms_writeback_atomic_check. All the supported + * format must: + * - Be listed in vkms_wb_formats in vkms_writeback.c + * - Have a pixel_write callback defined here + */ + pr_err("Pixel format %p4cc is not supported by VKMS writeback. This is a= kernel bug, atomic check must forbid this configuration.\n", + &format); + BUG(); } } diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkm= s_formats.h index cf59c2ed8e9a..3ecea4563254 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.h +++ b/drivers/gpu/drm/vkms/vkms_formats.h @@ -5,8 +5,8 @@ =20 #include "vkms_drv.h" =20 -void *get_pixel_conversion_function(u32 format); +pixel_read_t get_pixel_read_function(u32 format); =20 -void *get_pixel_write_function(u32 format); +pixel_write_t get_pixel_write_function(u32 format); =20 #endif /* _VKMS_FORMATS_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index 21b5adfb44aa..10e9b23dab28 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -125,7 +125,7 @@ static void vkms_plane_atomic_update(struct drm_plane *= plane, drm_rect_rotate(&frame_info->rotated, drm_rect_width(&frame_info->rotated= ), drm_rect_height(&frame_info->rotated), frame_info->rotation); =20 - vkms_plane_state->pixel_read =3D get_pixel_conversion_function(fmt); + vkms_plane_state->pixel_read =3D get_pixel_read_function(fmt); } =20 static int vkms_plane_atomic_check(struct drm_plane *plane, --=20 2.46.2 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 0925B1C3F0E; Thu, 31 Oct 2024 17:53:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397228; cv=none; b=o5VhfT6owo8wKa9A9yxXgoHy4mHPySgDf8BmX78x+1my3g3/bSLENHQ4AiT14iF4nspF1zNRiFhRjDikOd2yBCzj+xm7tkGpnApNfe9KvTKTHJM/wP/y2REj1EDgBCQa7uUiLmatpmeh1jphTVGDsGGCdGXi2ywrD+72Sr+Qq80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397228; c=relaxed/simple; bh=NJQ4BIoIQIoJWPyFV3ltFmfTqTQcgWJGwPuIgUylwt4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NsGuNzGyYzvxG6MMmnO8254HDX7ZtMaqnb9l6vcqaIWea/EHY/LpPhKvflu1A0GIVqCK3ZSOl5b16WuPx9bJhBwoiMSsKzd6IJ4yG2/7RImstl9JJaMyceeWuUzFD1exkFkiFL1/Cyea2rqaSQgBJWVIqfashdAhVoWCo6VD8nA= 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=Y+K8cH1K; arc=none smtp.client-ip=217.70.183.196 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="Y+K8cH1K" Received: by mail.gandi.net (Postfix) with ESMTPSA id 1ECB7E0007; Thu, 31 Oct 2024 17:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397224; 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=1SzheK38TqKTamJuQO4NjG5/hQD5MrdB/SoQUKg3juA=; b=Y+K8cH1KSwmXOkiE3Ynp1wiglW6nXpH/+2WgWwOUpScpQifIFY1iVvLMekm9g8rFcF4uef bh784O11BTgud70EVOE4CGvkSvCsFXNbx23MDQdBkJdPQRIHEGscJ4Ww8DXtpMaQ6VrJ8F eTHlwn7EDgCKTJAsNoJQCpxtJwqqvXvXzx5jCofBP3YdM+HKXidyHvIkb0uMXXHfAocdjq vysWl8AW1O37j3He4TjmPkcapSDcGU/yF5+lUq1DvFNjoH12xK8UsHRKzfxpDr0XVUrDgO PjoZoZq/YtvHDQ5p60syL2ufajUukh0WzRy6yCLpOfNr8WUJGNwylod8uDAhLA== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:28 +0100 Subject: [PATCH v13 4/9] drm/vkms: Use const for input pointers in pixel_read an pixel_write functions 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: <20241031-yuv-v13-4-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, Pekka Paalanen , =?utf-8?q?Ma=C3=ADra_Canal?= X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=5640; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=NJQ4BIoIQIoJWPyFV3ltFmfTqTQcgWJGwPuIgUylwt4=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8QcS2CqoRfghJPDC8hC1IaAkNyoJE3tRRKcA y3vVRBd2fSJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEHAAKCRAgrS7GWxAs 4qdGEAC6OUsIuPHAjsX1iJre+YpRxcxsb4mRBaWN8TLubToWGD2s0fh9JdmChUH5bqBqbdPtiX+ cpdF+cSC5GHjwSQX9g1DoGESBj+UsX/T3NLCHTJ4XQBw22qw0QMlrQ03B7q1lGdPwwklEn1MMIz e6uut6KUSI2T/hvNnRZFjlgpaILseSZgv5e9Mv33BR8YwIIW6nppZWw4a3kpK/2/22rnwi8fg+m iOEfbUsTnJhDjz1Ou5Oz9nybPDgtdfzBLM82o1ZUgHTvXXxl6zmaJ2PEDitWGLphZ22yCYVrLsd ACs+/0GkkoKx+FMYB7S3kFIcXAe17FGhro/2g7Q4xo9EfqnAtF2CfvPSJdFmKc6Mj7OA+m6fvLH 0Olp/tHUoOMsR4YnvA2Kw9GMnD6JKwmbEJEFJHGCsQbdtkBI9Niqoos+RFLF39Yq7QaYOceDekF aOltRH+CeNwgN0nW6BvIQomvxbfjZ0JlaxjTEw78vZu3UqFUvySVP3pWe/nbwOOgSb/HIkI3yKc AlN3Mm/L7POFaKl5kkGEYv9TUqfLW0gxEBd9rBSuJTxdu4NQPjeNk6MADPH45EdMB0bQKQB6Sv2 DDZDrK+mG6duiaR5QM46Br9k8g+PcpwviAVL8LYUdc0GaiBVbowAklaRu1F0fzJXiCtfBGIzh8d P/tzZngEli0z6pg== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com As the pixel_read and pixel_write function should never modify the input buffer, mark those pointers const. Reviewed-by: Pekka Paalanen Reviewed-by: Ma=C3=ADra Canal Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_drv.h | 4 ++-- drivers/gpu/drm/vkms/vkms_formats.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index e0d46defed83..3f45290a0c5d 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -61,7 +61,7 @@ struct line_buffer { * @out_pixel: destination address to write the pixel * @in_pixel: pixel to write */ -typedef void (*pixel_write_t)(u8 *out_pixel, struct pixel_argb_u16 *in_pix= el); +typedef void (*pixel_write_t)(u8 *out_pixel, const struct pixel_argb_u16 *= in_pixel); =20 struct vkms_writeback_job { struct iosys_map data[DRM_FORMAT_MAX_PLANES]; @@ -76,7 +76,7 @@ struct vkms_writeback_job { * @in_pixel: pointer to the pixel to read * @out_pixel: pointer to write the converted pixel */ -typedef void (*pixel_read_t)(u8 *in_pixel, struct pixel_argb_u16 *out_pixe= l); +typedef void (*pixel_read_t)(const u8 *in_pixel, struct pixel_argb_u16 *ou= t_pixel); =20 /** * struct vkms_plane_state - Driver specific plane state diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index b9544e67cd4f..06aef5162529 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -75,7 +75,7 @@ static int get_x_position(const struct vkms_frame_info *f= rame_info, int limit, i * They are used in the vkms_compose_row() function to handle multiple for= mats. */ =20 -static void ARGB8888_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_= pixel) +static void ARGB8888_to_argb_u16(const u8 *in_pixel, struct pixel_argb_u16= *out_pixel) { /* * The 257 is the "conversion ratio". This number is obtained by the @@ -89,7 +89,7 @@ static void ARGB8888_to_argb_u16(u8 *in_pixel, struct pix= el_argb_u16 *out_pixel) out_pixel->b =3D (u16)in_pixel[0] * 257; } =20 -static void XRGB8888_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_= pixel) +static void XRGB8888_to_argb_u16(const u8 *in_pixel, struct pixel_argb_u16= *out_pixel) { out_pixel->a =3D (u16)0xffff; out_pixel->r =3D (u16)in_pixel[2] * 257; @@ -97,7 +97,7 @@ static void XRGB8888_to_argb_u16(u8 *in_pixel, struct pix= el_argb_u16 *out_pixel) out_pixel->b =3D (u16)in_pixel[0] * 257; } =20 -static void ARGB16161616_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *= out_pixel) +static void ARGB16161616_to_argb_u16(const u8 *in_pixel, struct pixel_argb= _u16 *out_pixel) { __le16 *pixel =3D (__le16 *)in_pixel; =20 @@ -107,7 +107,7 @@ static void ARGB16161616_to_argb_u16(u8 *in_pixel, stru= ct pixel_argb_u16 *out_pi out_pixel->b =3D le16_to_cpu(pixel[0]); } =20 -static void XRGB16161616_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *= out_pixel) +static void XRGB16161616_to_argb_u16(const u8 *in_pixel, struct pixel_argb= _u16 *out_pixel) { __le16 *pixel =3D (__le16 *)in_pixel; =20 @@ -117,7 +117,7 @@ static void XRGB16161616_to_argb_u16(u8 *in_pixel, stru= ct pixel_argb_u16 *out_pi out_pixel->b =3D le16_to_cpu(pixel[0]); } =20 -static void RGB565_to_argb_u16(u8 *in_pixel, struct pixel_argb_u16 *out_pi= xel) +static void RGB565_to_argb_u16(const u8 *in_pixel, struct pixel_argb_u16 *= out_pixel) { __le16 *pixel =3D (__le16 *)in_pixel; =20 @@ -173,7 +173,7 @@ void vkms_compose_row(struct line_buffer *stage_buffer,= struct vkms_plane_state * They are used in vkms_writeback_row() to convert and store a pixel from= the src_buffer to * the writeback buffer. */ -static void argb_u16_to_ARGB8888(u8 *out_pixel, struct pixel_argb_u16 *in_= pixel) +static void argb_u16_to_ARGB8888(u8 *out_pixel, const struct pixel_argb_u1= 6 *in_pixel) { /* * This sequence below is important because the format's byte order is @@ -191,7 +191,7 @@ static void argb_u16_to_ARGB8888(u8 *out_pixel, struct = pixel_argb_u16 *in_pixel) out_pixel[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); } =20 -static void argb_u16_to_XRGB8888(u8 *out_pixel, struct pixel_argb_u16 *in_= pixel) +static void argb_u16_to_XRGB8888(u8 *out_pixel, const struct pixel_argb_u1= 6 *in_pixel) { out_pixel[3] =3D 0xff; out_pixel[2] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); @@ -199,7 +199,7 @@ static void argb_u16_to_XRGB8888(u8 *out_pixel, struct = pixel_argb_u16 *in_pixel) out_pixel[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); } =20 -static void argb_u16_to_ARGB16161616(u8 *out_pixel, struct pixel_argb_u16 = *in_pixel) +static void argb_u16_to_ARGB16161616(u8 *out_pixel, const struct pixel_arg= b_u16 *in_pixel) { __le16 *pixel =3D (__le16 *)out_pixel; =20 @@ -209,7 +209,7 @@ static void argb_u16_to_ARGB16161616(u8 *out_pixel, str= uct pixel_argb_u16 *in_pi pixel[0] =3D cpu_to_le16(in_pixel->b); } =20 -static void argb_u16_to_XRGB16161616(u8 *out_pixel, struct pixel_argb_u16 = *in_pixel) +static void argb_u16_to_XRGB16161616(u8 *out_pixel, const struct pixel_arg= b_u16 *in_pixel) { __le16 *pixel =3D (__le16 *)out_pixel; =20 @@ -219,7 +219,7 @@ static void argb_u16_to_XRGB16161616(u8 *out_pixel, str= uct pixel_argb_u16 *in_pi pixel[0] =3D cpu_to_le16(in_pixel->b); } =20 -static void argb_u16_to_RGB565(u8 *out_pixel, struct pixel_argb_u16 *in_pi= xel) +static void argb_u16_to_RGB565(u8 *out_pixel, const struct pixel_argb_u16 = *in_pixel) { __le16 *pixel =3D (__le16 *)out_pixel; =20 --=20 2.46.2 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 3BC691C6F76; Thu, 31 Oct 2024 17:53:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397230; cv=none; b=ZUByq857SkbSWrkIe+6TOK2zTpOTXY7oXRFQd2TzjrHD/aLDGEDGRYINpbwtO2dBf/JIkqdAUl7mj1Ou8apguERlqfjw9W/vC1QcnS7JBBvdaziTZGGGM1bTFohz13UEML3eMt4GoEfcAD9XVysvMAG09KxnDCrTWWCFm3FmuAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397230; c=relaxed/simple; bh=TrbBlfsrHwL2c/9AC9U5O9s1vUwjhAMLnNo3GmP8C2U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Z6Phjd0lLQT2Z/qMF6YpLjGGwIoWTtCQpZCy+T+Cm5vDDhda4aNvZZ+aGwhoJxjUfv0wc9msYkOfhWxEhDaznwcj/202cKB+rGyfTTgGwMHUyPqOPH41DOumQl6MKG1F7p784RukNsohuMpqxX7rPdsS3s6mo9Wc2uVa1rYkb08= 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=omhgsTm+; arc=none smtp.client-ip=217.70.183.196 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="omhgsTm+" Received: by mail.gandi.net (Postfix) with ESMTPSA id 75BC0E0009; Thu, 31 Oct 2024 17:53:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397225; 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=DFJYGplsVzujfKzKS5WLV9n7KOP1d0dLCDeEHwgIhsU=; b=omhgsTm+RMJmyKupwQW76Ds3Uc2D+q5hx2fwZHQ+Gq/GfKUWno4/LVyIFOFZ3yjy2OKhzC bkAR3T5uOlM9pjOjx7B81xc6DWnOUDzAT5Dh5EYo5VccP2f6EgWRes8HsvfX60dmf172ES rNZo4IEvo966G+AEBTdgeQ8nzfbBWQYXNwmZ7gB19Ih8GNNrDaR1W8qV+yzwkuFmgXJvbY 0H6VXAzv/jQx6DPC7sed09N6BAEv4uWlaQFoXkqaKB2HGAoPGpIWXgCWbfYEJEhEh2rHTM cJJE+WmanufKFee86Hg11nqp/IZmvyg28n2eNcmIEJb9J/+Mqy3Ik3dWMGCoIw== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:29 +0100 Subject: [PATCH v13 5/9] drm/vkms: Update pixels accessor to support packed and multi-plane formats. 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: <20241031-yuv-v13-5-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=8841; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=TrbBlfsrHwL2c/9AC9U5O9s1vUwjhAMLnNo3GmP8C2U=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8QcDKcgYhndaRe31Z1GB1Nquu7jDf+wld34B TQahRAr3L2JAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEHAAKCRAgrS7GWxAs 4rJQD/4wYOjDBcHBHevmP8d25WUJyBSswen3J0rYng6WqjOleGfZXlXIuqwrJhxP5YUzu5/ysID WY99SXevedzmhi0eMk9vpbnQhu3w9WGSZvMm4VHNZeuv5/gdmfFRPmsjb665IM2+SvK2wj5HwSY ZFroC7G967oN23AniXQppoBme2ELTYH5G3vBbm4PqRQMQf/zT92wfNBVKbHQxXQZjcFae1oXkhT wHeNgPhGMeiMwsUMFefH+0anDO2Zu8oA7JQljWrMnyseEI4ZEGWGbDvULZKBL1EPOVIOPGKMfvJ 4e3fNOFI+LXxe8IunCDjO8l1JvZyqYTgmDfEIE18xdJCBiFHAFj1hyj11YvDYrQ+qdotwbYj+Tl 0VlK2Anb8ir/ypdWB7pzxsZguyfkH2Y54h+PA3BkvC6r9AQUkqHY+CO8h4lQJykxrFWHvFHkaPG qjoj0kSJzpMBcdFniw9n4BapS2E3Bfp3sHh8wG/kffn7dBHHAV1pueLxQsNpfTKSmjWsY4uJiKy 5oE5bJUXkvZV/Mmgy/SQ7CI+WrGMuQvGdtxbSKHA3iRFO6SYLPBwcPFSa+zARaKY6wWJ7BI50Jb 3w9uI7fg7xaphywdDhFjURyozOZcvFExiDFkpXyYfX/J/FApSrdg5vQmEwnGPSJ1o8BiAAWEmzt ZE5w2a33fwZp61Q== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com Introduce the usage of block_h/block_w to compute the offset and the pointer of a pixel. The previous implementation was specialized for planes with block_h =3D=3D block_w =3D=3D 1. To avoid confusion and allow e= asier implementation of tiled formats. It also remove the usage of the deprecated format field `cpp`. Introduce the plane_index parameter to get an offset/pointer on a different plane. Acked-by: Ma=C3=ADra Canal Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_formats.c | 114 ++++++++++++++++++++++++++++----= ---- 1 file changed, 91 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index 06aef5162529..7f932d42394d 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -10,22 +10,46 @@ #include "vkms_formats.h" =20 /** - * pixel_offset() - Get the offset of the pixel at coordinates x/y in the = first plane + * packed_pixels_offset() - Get the offset of the block containing the pix= el at coordinates x/y * * @frame_info: Buffer metadata * @x: The x coordinate of the wanted pixel in the buffer * @y: The y coordinate of the wanted pixel in the buffer + * @plane_index: The index of the plane to use + * @offset: The returned offset inside the buffer of the block + * @rem_x: The returned X coordinate of the requested pixel in the block + * @rem_y: The returned Y coordinate of the requested pixel in the block * - * The caller must ensure that the framebuffer associated with this reques= t uses a pixel format - * where block_h =3D=3D block_w =3D=3D 1. - * If this requirement is not fulfilled, the resulting offset can point to= an other pixel or - * outside of the buffer. + * As some pixel formats store multiple pixels in a block (DRM_FORMAT_R* f= or example), some + * pixels are not individually addressable. This function return 3 values:= the offset of the + * whole block, and the coordinate of the requested pixel inside this bloc= k. + * For example, if the format is DRM_FORMAT_R1 and the requested coordinat= e is 13,5, the offset + * will point to the byte 5*pitches + 13/8 (second byte of the 5th line), = and the rem_x/rem_y + * coordinates will be (13 % 8, 5 % 1) =3D (5, 0) + * + * With this function, the caller just have to extract the correct pixel f= rom the block. */ -static size_t pixel_offset(const struct vkms_frame_info *frame_info, int x= , int y) +static void packed_pixels_offset(const struct vkms_frame_info *frame_info,= int x, int y, + int plane_index, int *offset, int *rem_x, int *rem_y) { struct drm_framebuffer *fb =3D frame_info->fb; + const struct drm_format_info *format =3D frame_info->fb->format; + /* Directly using x and y to multiply pitches and format->ccp is not suff= icient because + * in some formats a block can represent multiple pixels. + * + * Dividing x and y by the block size allows to extract the correct offse= t of the block + * containing the pixel. + */ =20 - return fb->offsets[0] + (y * fb->pitches[0]) + (x * fb->format->cpp[0]); + int block_x =3D x / drm_format_info_block_width(format, plane_index); + int block_y =3D y / drm_format_info_block_height(format, plane_index); + int block_pitch =3D fb->pitches[plane_index] * drm_format_info_block_heig= ht(format, + plane_index); + *rem_x =3D x % drm_format_info_block_width(format, plane_index); + *rem_y =3D y % drm_format_info_block_height(format, plane_index); + *offset =3D fb->offsets[plane_index] + + block_y * block_pitch + + block_x * format->char_per_block[plane_index]; } =20 /** @@ -35,30 +59,71 @@ static size_t pixel_offset(const struct vkms_frame_info= *frame_info, int x, int * @frame_info: Buffer metadata * @x: The x (width) coordinate inside the plane * @y: The y (height) coordinate inside the plane + * @plane_index: The index of the plane + * @addr: The returned pointer + * @rem_x: The returned X coordinate of the requested pixel in the block + * @rem_y: The returned Y coordinate of the requested pixel in the block * - * Takes the information stored in the frame_info, a pair of coordinates, = and - * returns the address of the first color channel. - * This function assumes the channels are packed together, i.e. a color ch= annel - * comes immediately after another in the memory. And therefore, this func= tion - * doesn't work for YUV with chroma subsampling (e.g. YUV420 and NV21). + * Takes the information stored in the frame_info, a pair of coordinates, = and returns the address + * of the block containing this pixel and the pixel position inside this b= lock. * - * The caller must ensure that the framebuffer associated with this reques= t uses a pixel format - * where block_h =3D=3D block_w =3D=3D 1, otherwise the returned pointer c= an be outside the buffer. + * See @packed_pixel_offset for details about rem_x/rem_y behavior. */ -static void *packed_pixels_addr(const struct vkms_frame_info *frame_info, - int x, int y) +static void packed_pixels_addr(const struct vkms_frame_info *frame_info, + int x, int y, int plane_index, u8 **addr, int *rem_x, + int *rem_y) { - size_t offset =3D pixel_offset(frame_info, x, y); + int offset; =20 - return (u8 *)frame_info->map[0].vaddr + offset; + packed_pixels_offset(frame_info, x, y, plane_index, &offset, rem_x, rem_y= ); + *addr =3D (u8 *)frame_info->map[0].vaddr + offset; } =20 -static void *get_packed_src_addr(const struct vkms_frame_info *frame_info,= int y) +/** + * packed_pixels_addr_1x1() - Get the pointer to the block containing the = pixel at the given + * coordinates + * + * @frame_info: Buffer metadata + * @x: The x (width) coordinate inside the plane + * @y: The y (height) coordinate inside the plane + * @plane_index: The index of the plane + * @addr: The returned pointer + * + * This function can only be used with format where block_h =3D=3D block_w= =3D=3D 1. + */ +static void packed_pixels_addr_1x1(const struct vkms_frame_info *frame_inf= o, + int x, int y, int plane_index, u8 **addr) +{ + int offset, rem_x, rem_y; + + WARN_ONCE(drm_format_info_block_width(frame_info->fb->format, + plane_index) !=3D 1, + "%s() only support formats with block_w =3D=3D 1", __func__); + WARN_ONCE(drm_format_info_block_height(frame_info->fb->format, + plane_index) !=3D 1, + "%s() only support formats with block_h =3D=3D 1", __func__); + + packed_pixels_offset(frame_info, x, y, plane_index, &offset, &rem_x, + &rem_y); + *addr =3D (u8 *)frame_info->map[0].vaddr + offset; +} + +static void *get_packed_src_addr(const struct vkms_frame_info *frame_info,= int y, + int plane_index) { int x_src =3D frame_info->src.x1 >> 16; int y_src =3D y - frame_info->rotated.y1 + (frame_info->src.y1 >> 16); + u8 *addr; + int rem_x, rem_y; + + WARN_ONCE(drm_format_info_block_width(frame_info->fb->format, plane_index= ) !=3D 1, + "%s() only support formats with block_w =3D=3D 1", __func__); + WARN_ONCE(drm_format_info_block_height(frame_info->fb->format, plane_inde= x) !=3D 1, + "%s() only support formats with block_h =3D=3D 1", __func__); =20 - return packed_pixels_addr(frame_info, x_src, y_src); + packed_pixels_addr(frame_info, x_src, y_src, plane_index, &addr, &rem_x, = &rem_y); + + return addr; } =20 static int get_x_position(const struct vkms_frame_info *frame_info, int li= mit, int x) @@ -152,14 +217,14 @@ void vkms_compose_row(struct line_buffer *stage_buffe= r, struct vkms_plane_state { struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; struct vkms_frame_info *frame_info =3D plane->frame_info; - u8 *src_pixels =3D get_packed_src_addr(frame_info, y); + u8 *src_pixels =3D get_packed_src_addr(frame_info, y, 0); int limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), stage_buffe= r->n_pixels); =20 for (size_t x =3D 0; x < limit; x++, src_pixels +=3D frame_info->fb->form= at->cpp[0]) { int x_pos =3D get_x_position(frame_info, limit, x); =20 if (drm_rotation_90_or_270(frame_info->rotation)) - src_pixels =3D get_packed_src_addr(frame_info, x + frame_info->rotated.= y1) + src_pixels =3D get_packed_src_addr(frame_info, x + frame_info->rotated.= y1, 0) + frame_info->fb->format->cpp[0] * y; =20 plane->pixel_read(src_pixels, &out_pixels[x_pos]); @@ -250,7 +315,10 @@ void vkms_writeback_row(struct vkms_writeback_job *wb, { struct vkms_frame_info *frame_info =3D &wb->wb_frame_info; int x_dst =3D frame_info->dst.x1; - u8 *dst_pixels =3D packed_pixels_addr(frame_info, x_dst, y); + u8 *dst_pixels; + int rem_x, rem_y; + + packed_pixels_addr(frame_info, x_dst, y, 0, &dst_pixels, &rem_x, &rem_y); struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), src_buffe= r->n_pixels); =20 --=20 2.46.2 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 8A5C01C9B9A; Thu, 31 Oct 2024 17:53:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397231; cv=none; b=KZOU7C3CNu+6LB4U7ohlJEK16y7gNOzu6mmpg0cNbvWD7N4ujC80tvpjd/BIMtWoDm1XRXmoP/Hl7nknTrUMkFWsv1ZBt2Elfe2GNFRs9WzGTqBOC0bRfOBhM/TL9YHsnMqGPHgedoQqxPIZk8vTCqGUs8zmWyB1YvUA25YFqec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397231; c=relaxed/simple; bh=JEfqJm+ZjNrd0HRCXf+3IpbuUc2vRJzj0Cqmn8I4SPA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KV/IqkNzN7VLwP6J8a5/SpYZkboGMPwPrE8oNT1RmHl/GBtAPJ3JbEFO2IaFCtjdDhjteQMN4Z7CFx/+9md9NonkI018WJyGg44pYQqhIgxamlL/94JnwP7N/gjtAHlMnOk0JAuFskFWhwgvgFElomFEAMwvEMd6z3p78CZidYo= 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=hwlDPPDc; arc=none smtp.client-ip=217.70.183.196 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="hwlDPPDc" Received: by mail.gandi.net (Postfix) with ESMTPSA id B5986E000B; Thu, 31 Oct 2024 17:53:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397227; 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=4ep0B8W0dWDgOAnvfxKLWEqaGgJI444n/Y1F+rhWVIA=; b=hwlDPPDcF2F1MNZmaN1UXUpAAFW/mtR1/yP7tF60d5d7IY64t+e5lHAc92fgzNvTQJ3GXy WuGiDLAU3X/dnDuPmfH9H+Xrqm2MiJzx+2cIorGz8TTS7fvEg9hRHEN01v5qulvVq2uJlD SPjqz/KKwJtg38RH9IATb14CyCgjAXtTauXNjMYMVfexldqNS1nLAqU1KH3ueQcpmaguho YDEDBwFUn3UMSI9r/KTOLmD1qEH0NgS6VJ0rw4VN2TwRVnqdqGB+cJe8Ec7eV2q/a3uNHg 5a+EnV37s8J0WWKk+sL36PW0AH2YGgxAR6gsEc/yIMj5GZ6pI+S/UHNGaagrmg== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:30 +0100 Subject: [PATCH v13 6/9] 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: <20241031-yuv-v13-6-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, Pekka Paalanen X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4077; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=JEfqJm+ZjNrd0HRCXf+3IpbuUc2vRJzj0Cqmn8I4SPA=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8Qc9L4X+UkP6vtV7DEEj7VGoPTBzxH006Of6 MrzHzN8rsuJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEHAAKCRAgrS7GWxAs 4gkoD/9hYLIgpFc5NFsRwmGgLWuipiY2Jx3czupymdOeapqnnKWBarM20iqmjLh7hHHVr5KMnC3 a/8wATu1iwvlESDfDmYB/QnYJ4wnJPwic2RW/WRZIg8btUvfZwS2uJnfGZN6P0idDVSM56hX3wB dJNRIwipeXKFZ3fku2Y7nQ8dobOtqfOkbbRWFYqed7I12/ZQL1ixXEVi/Z3R/NyH58cYUiS9Mrh EreKgCqIt4fvL+jUKvpVY9JVEtHtrYxQ+hlX+y+C3j/s62YmsC1cUDQnb3nMoLGnxh1loiJBaMu dWchuglvAga1G4eyAGOor1IgQwlDRBV1PhhrDlkk5IQzVA+J6PZmoTRZI3WgWA6oMCWvjpDJEkj FUskMkS95Tfsq8sSAI2LBHYHnsvIz4ku6RPtmzzXWUNUHOZZa7qc63vFtebDwLvH14PxMVhTVsy Am7Oke0zKB+DDr4bHvDl8rDjLbWkLpiP92H+z6+5+EocBLNlnmcPsFulMq1ufvYEFvj/Qy73oXE 5geifVJgwIuvcMKOMqh83bhnjtmGUg1/MRnOO4nFEbWoZfvXe1Wv2eb/ITVdetH1Bffj/QM9OKY HXyT8I+oShoFgD7O823nCI+34SJ4H2O1m1Vl8Ete+loIFm/aKPsTo9Z8zDZxsP9ryFLH+RNywYN ZNTuzUKisL7QZIw== 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 Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- 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..ecac0bc858a0 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 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 9AFE11C9EC6; Thu, 31 Oct 2024 17:53:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397232; cv=none; b=smiumpOEUMwlfxIFjdakqsmsFsWd/dMw/pT6TW3vU8a16tifd0mbweGgwnE+UzLCvc2KdR3aaNQGEojdnelDfgL8TpKXYbMhxLcmeZFVXh+l7+OKawU4AEcZPDswQ1qFcEbRDM0VjiHjL/88JmbFelAtl5JWgOitD6+QkLx1aaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397232; c=relaxed/simple; bh=jtnQPYmraR91F1KxrEvc/jaZ4vMp0evQSPda1XffPS0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XqeCgHri3ea4vTOi6k9XtxAMirXD4tkCw+uNFKV74LiH9xImAoAidnxG3sFtsRXAjI6frGCSNxwKD5MHpeTXnepoj9XGghFhn9b7yBHOlAnGcWilGLGHMtsg1IAK94n2khUbgc39pWtC/9mseb4Jub1wqotUVv62nO5kXoIA8rs= 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=O6KOZ4la; arc=none smtp.client-ip=217.70.183.196 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="O6KOZ4la" 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 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: <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 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=C3=ADra Canal Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- 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/vk= ms_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 *cr= tc_state, struct line_buff } } =20 +/** + * direction_for_rotation() - Get the correct reading direction for a give= n rotation + * + * @rotation: Rotation to analyze. It correspond the field @frame_info.rot= ation. + * + * This function will use the @rotation setting of a source plane to compu= te the reading + * direction in this plane which correspond to a "left to right writing" i= n the CRTC. + * For example, if the buffer is reflected on X axis, the pixel must be re= ad from right to left + * to be written from left to right on the CRTC. + */ +static enum pixel_read_direction direction_for_rotation(unsigned int rotat= ion) +{ + 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 =3D DRM_RECT_INIT(0, 0, 0, 0); + tmp_b =3D 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 =3D tmp_b.x1 - tmp_a.x1; + y =3D tmp_b.y1 - tmp_a.y1; + + if (x =3D=3D 1 && y =3D=3D 0) + return READ_LEFT_TO_RIGHT; + else if (x =3D=3D -1 && y =3D=3D 0) + return READ_RIGHT_TO_LEFT; + else if (y =3D=3D 1 && x =3D=3D 0) + return READ_TOP_TO_BOTTOM; + else if (y =3D=3D -1 && x =3D=3D 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_dr= v.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; }; =20 +/** + * 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/vkm= s_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_i= nfo *frame_info, *addr =3D (u8 *)frame_info->map[0].vaddr + offset; } =20 +/** + * get_block_step_bytes() - Common helper to compute the correct step valu= e 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 bl= ocks 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, s= o the step must be used + * only every 8 pixels). + */ +static int get_block_step_bytes(struct drm_framebuffer *fb, enum pixel_rea= d_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->f= ormat, + 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 --=20 2.46.2 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 E5F9B1CB324; Thu, 31 Oct 2024 17:53:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397235; cv=none; b=L1KvhhimFufpYrtim2t15UZpiEoHb73RDZuuLtfVyxwbz15DfpIAxzKXSVzyLD66tvaRmEhSsVE7uZ5V/M/C+ZD26PaDWfkn4jiwsDIhbi4B5wGzx55HVwYNf9+Yoen/7sxL2KvQlHQ3okslnaNV7XIEguj9CKdMZQBV+48NQG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397235; c=relaxed/simple; bh=ZcUcVHgDVk+R7TSkFq+b7fF5Ol1IrMVPmpaqUzmLwdY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ld0JR5GTgINTdkM27LvDUNTTyO5chdWMl47YSWkywUx7a74pKenmaJvN5kVkmq9mifL1T3brWGup17TS8YdReyfq11Yxf7FbjPfMozZ/1EKLjWdV1sP4e7EQ4QOeY7VJpu2x5FRaK7z+4R/nhmMfBbSpa+2tUEK04rVm7+EcQ3U= 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=REZvRcU+; arc=none smtp.client-ip=217.70.183.196 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="REZvRcU+" Received: by mail.gandi.net (Postfix) with ESMTPSA id 5DA2AE000A; Thu, 31 Oct 2024 17:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397229; 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=kDkltzzKJKrlcZFOS6z1/vPZJzSQrKVUL6d628YDE8o=; b=REZvRcU+wMKRef6Np3HvGkbDDm1jGNJDBZCVJG8zPPgi/n5cRyjnZP4CE1JVqIi3gthMIB RxGgiOTc3nSoN0umYiFzzaFgyE56i6TBZfqvyBACVVqlllNtanzRtZD9mcbHb2jRB8BjiB +v8a2iq0DY0s8GIShaLyxXW809qXj/vnS0lL48R3ZUPHwhjq5VwBwA8NYAoOSAzx2AXYR2 nkM1c6f/xM8RjFjziBB1YcUDuP6/BClmRvOyDaiksRjbIRA+o8vnXGlu6HUdobsALj/nyQ tnljkOQNXUG7rPZlyTJ1anS7jiqCzhYS4b125EiA1v2iTagIXOAC49nRHpTKRQ== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:32 +0100 Subject: [PATCH v13 8/9] drm/vkms: Re-introduce line-per-line composition algorithm 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: <20241031-yuv-v13-8-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, Pekka Paalanen X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=30344; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=ZcUcVHgDVk+R7TSkFq+b7fF5Ol1IrMVPmpaqUzmLwdY=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8Qda9gUt9Dmx8iCDvgJKOBwrTentCV7QwPe3 Cm11eigmCmJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEHQAKCRAgrS7GWxAs 4mr+D/9h+xu/0HwH7iaVPStCZ+wGk80bquJcjXngN9k2i8y05U1VMWtGQXbDAR9mLHMstykkub0 dYDhT6gUdHF6nD3WOH7O+4u4aM6uM2d3ICCYM+NvZo24zHPJH0N93jUXIpoGu0RY7Y7MiyHQn69 LLyhPwNq3DQQRgV1xMRk23nYJJ0UytstoVayZsqzDMyLzvJ7U9A3kqt3vJzdiNKnypW7Fu9m/f+ 4yHD+AC7475y/koc7iYiSM84sCF7+rID5F2XywJRz5KuQ2fd6eJnt+qtvpGi7TkxHpyLGtSu5y5 ui8bav+xfJLR0/X13ijn/+DdUl/PJ62DyR1v/vwMayIp8qimCjRpVCDLpsEL2oIitaiF6/vLOR5 SP2qpQjSL18CxUmMclyvYk1BlsZcoTmXWMlXGzG1NGwvGRcDSZfta5I9iLQt1GCxp94gQVYh1RA Q4WCZRI91uAZIgShgmdMOR2DKo/FWkSwg8p+/uG7eDJC6hApz/f1H0EkF5nHbczVhkC1Tl6VBxU x3XywIhftIZN11SAZrrxASwcM9K2SDYmU900ejW73r1Dtq0hKzT2zuM12uKzrz7zUzS0SbLZVKX sGr09Elfaq0TJxOXPhz2FTwW7xgxIjclONLb5ixrjR0J9u0+9eL8rlYGAI0COi3fGXJtfdyu4mH OCHESLg1HZgbceg== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com Re-introduce a line-by-line composition algorithm for each pixel format. This allows more performance by not requiring an indirection per pixel read. This patch is focused on readability of the code. Line-by-line composition was introduced by [1] but rewritten back to pixel-by-pixel algorithm in [2]. At this time, nobody noticed the impact on performance, and it was merged. This patch is almost a revert of [2], but in addition efforts have been made to increase readability and maintainability of the rotation handling. The blend function is now divided in two parts: - Transformation of coordinates from the output referential to the source referential - Line conversion and blending Most of the complexity of the rotation management is avoided by using drm_rect_* helpers. The remaining complexity is around the clipping, to avoid reading/writing outside source/destination buffers. The pixel conversion is now done line-by-line, so the read_pixel_t was replaced with read_pixel_line_t callback. This way the indirection is only required once per line and per plane, instead of once per pixel and per plane. The read_line_t callbacks are very similar for most pixel format, but it is required to avoid performance impact. Some helpers for color conversion were introduced to avoid code repetition: - *_to_argb_u16: perform colors conversion. They should be inlined by the compiler, and they are used to avoid repetition between multiple variants of the same format (argb/xrgb and maybe in the future for formats like bgr formats). This new algorithm was tested with: - kms_plane (for color conversions) - kms_rotation_crc (for rotations of planes) - kms_cursor_crc (for translations of planes) - kms_rotation (for all rotations and formats combinations) [3] The performance gain was mesured with kms_fb_stress [4] with some modification to fix the writeback format. The performance improvement is around 5 to 10%. [1]: commit 8ba1648567e2 ("drm: vkms: Refactor the plane composer to accept new formats") https://lore.kernel.org/all/20220905190811.25024-7-igormtorrente@gmail= .com/ [2]: commit 322d716a3e8a ("drm/vkms: isolate pixel conversion functionality") https://lore.kernel.org/all/20230418130525.128733-2-mcanal@igalia.com/ [3]: https://lore.kernel.org/igt-dev/20240313-new_rotation-v2-0-6230fd5cae5= 9@bootlin.com/ [4]: https://lore.kernel.org/all/20240422-kms_fb_stress-dev-v5-0-0c577163dc= 88@riseup.net/ Signed-off-by: Louis Chauvet Acked-by: Pekka Paalanen # Conflicts: # drivers/gpu/drm/vkms/vkms_composer.c Acked-by: Pekka Paalanen Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_composer.c | 234 ++++++++++++++++++++++++++++---= ---- drivers/gpu/drm/vkms/vkms_drv.h | 28 +++-- drivers/gpu/drm/vkms/vkms_formats.c | 224 ++++++++++++++++++++-----------= -- drivers/gpu/drm/vkms/vkms_formats.h | 2 +- drivers/gpu/drm/vkms/vkms_plane.c | 5 +- 5 files changed, 344 insertions(+), 149 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index 601e33431b45..7a3e47b895a7 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -29,8 +29,8 @@ static u16 pre_mul_blend_channel(u16 src, u16 dst, u16 al= pha) * @x_start: The start offset * @pixel_count: The number of pixels to blend * - * The pixels [0;@pixel_count) in stage_buffer are blended at [@x_start;@x= _start+@pixel_count) in - * output_buffer. + * The pixels [@x_start;@x_start+@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 @@ -41,7 +41,7 @@ static void pre_mul_alpha_blend(const struct line_buffer = *stage_buffer, struct line_buffer *output_buffer, int x_start, int pixel_count) { struct pixel_argb_u16 *out =3D &output_buffer->pixels[x_start]; - const struct pixel_argb_u16 *in =3D stage_buffer->pixels; + const struct pixel_argb_u16 *in =3D &stage_buffer->pixels[x_start]; =20 for (int i =3D 0; i < pixel_count; i++) { out[i].a =3D (u16)0xffff; @@ -51,33 +51,6 @@ static void pre_mul_alpha_blend(const struct line_buffer= *stage_buffer, } } =20 -static int get_y_pos(struct vkms_frame_info *frame_info, int y) -{ - if (frame_info->rotation & DRM_MODE_REFLECT_Y) - return drm_rect_height(&frame_info->rotated) - y - 1; - - switch (frame_info->rotation & DRM_MODE_ROTATE_MASK) { - case DRM_MODE_ROTATE_90: - return frame_info->rotated.x2 - y - 1; - case DRM_MODE_ROTATE_270: - return y + frame_info->rotated.x1; - default: - return y; - } -} - -static bool check_limit(struct vkms_frame_info *frame_info, int pos) -{ - if (drm_rotation_90_or_270(frame_info->rotation)) { - if (pos >=3D 0 && pos < drm_rect_width(&frame_info->rotated)) - return true; - } else { - if (pos >=3D frame_info->rotated.y1 && pos < frame_info->rotated.y2) - return true; - } - - return false; -} =20 static void fill_background(const struct pixel_argb_u16 *background_color, struct line_buffer *output_buffer) @@ -203,6 +176,182 @@ static enum pixel_read_direction direction_for_rotati= on(unsigned int rotation) return READ_LEFT_TO_RIGHT; } =20 +/** + * clamp_line_coordinates() - Compute and clamp the coordinate to read and= write during the blend + * process. + * + * @direction: direction of the reading + * @current_plane: current plane blended + * @src_line: source line of the reading. Only the top-left coordinate is = used. This rectangle + * must be rotated and have a shape of 1*pixel_count if @direction is vert= ical and a shape of + * pixel_count*1 if @direction is horizontal. + * @src_x_start: x start coordinate for the line reading + * @src_y_start: y start coordinate for the line reading + * @dst_x_start: x coordinate to blend the read line + * @pixel_count: number of pixels to blend + * + * This function is mainly a safety net to avoid reading outside the sourc= e buffer. As the + * userspace should never ask to read outside the source plane, all the ca= ses covered here should + * be dead code. + */ +static void clamp_line_coordinates(enum pixel_read_direction direction, + const struct vkms_plane_state *current_plane, + const struct drm_rect *src_line, int *src_x_start, + int *src_y_start, int *dst_x_start, int *pixel_count) +{ + /* By default the start points are correct */ + *src_x_start =3D src_line->x1; + *src_y_start =3D src_line->y1; + *dst_x_start =3D current_plane->frame_info->dst.x1; + + /* Get the correct number of pixel to blend, it depends of the direction = */ + switch (direction) { + case READ_LEFT_TO_RIGHT: + case READ_RIGHT_TO_LEFT: + *pixel_count =3D drm_rect_width(src_line); + break; + case READ_BOTTOM_TO_TOP: + case READ_TOP_TO_BOTTOM: + *pixel_count =3D drm_rect_height(src_line); + break; + } + + /* + * Clamp the coordinates to avoid reading outside the buffer + * + * This is mainly a security check to avoid reading outside the buffer, t= he userspace + * should never request to read outside the source buffer. + */ + switch (direction) { + case READ_LEFT_TO_RIGHT: + case READ_RIGHT_TO_LEFT: + if (*src_x_start < 0) { + *pixel_count +=3D *src_x_start; + *dst_x_start -=3D *src_x_start; + *src_x_start =3D 0; + } + if (*src_x_start + *pixel_count > current_plane->frame_info->fb->width) + *pixel_count =3D max(0, (int)current_plane->frame_info->fb->width - + *src_x_start); + break; + case READ_BOTTOM_TO_TOP: + case READ_TOP_TO_BOTTOM: + if (*src_y_start < 0) { + *pixel_count +=3D *src_y_start; + *dst_x_start -=3D *src_y_start; + *src_y_start =3D 0; + } + if (*src_y_start + *pixel_count > current_plane->frame_info->fb->height) + *pixel_count =3D max(0, (int)current_plane->frame_info->fb->height - + *src_y_start); + break; + } +} + +/** + * blend_line() - Blend a line from a plane to the output buffer + * + * @current_plane: current plane to work on + * @y: line to write in the output buffer + * @crtc_x_limit: width of the output buffer + * @stage_buffer: temporary buffer to convert the pixel line from the sour= ce buffer + * @output_buffer: buffer to blend the read line into. + */ +static void blend_line(struct vkms_plane_state *current_plane, int y, + int crtc_x_limit, struct line_buffer *stage_buffer, + struct line_buffer *output_buffer) +{ + int src_x_start, src_y_start, dst_x_start, pixel_count; + struct drm_rect dst_line, tmp_src, src_line; + + /* Avoid rendering useless lines */ + if (y < current_plane->frame_info->dst.y1 || + y >=3D current_plane->frame_info->dst.y2) + return; + + /* + * dst_line is the line to copy. The initial coordinates are inside the + * destination framebuffer, and then drm_rect_* helpers are used to + * compute the correct position into the source framebuffer. + */ + dst_line =3D DRM_RECT_INIT(current_plane->frame_info->dst.x1, y, + drm_rect_width(¤t_plane->frame_info->dst), + 1); + + drm_rect_fp_to_int(&tmp_src, ¤t_plane->frame_info->src); + + /* + * [1]: Clamping src_line to the crtc_x_limit to avoid writing outside of + * the destination buffer + */ + dst_line.x1 =3D max_t(int, dst_line.x1, 0); + dst_line.x2 =3D min_t(int, dst_line.x2, crtc_x_limit); + /* The destination is completely outside of the crtc. */ + if (dst_line.x2 <=3D dst_line.x1) + return; + + src_line =3D dst_line; + + /* + * Transform the coordinate x/y from the crtc to coordinates into + * coordinates for the src buffer. + * + * - Cancel the offset of the dst buffer. + * - Invert the rotation. This assumes that + * dst =3D drm_rect_rotate(src, rotation) (dst and src have the + * same size, but can be rotated). + * - Apply the offset of the source rectangle to the coordinate. + */ + drm_rect_translate(&src_line, -current_plane->frame_info->dst.x1, + -current_plane->frame_info->dst.y1); + drm_rect_rotate_inv(&src_line, drm_rect_width(&tmp_src), + drm_rect_height(&tmp_src), + current_plane->frame_info->rotation); + drm_rect_translate(&src_line, tmp_src.x1, tmp_src.y1); + + /* Get the correct reading direction in the source buffer. */ + + enum pixel_read_direction direction =3D + direction_for_rotation(current_plane->frame_info->rotation); + + /* [2]: Compute and clamp the number of pixel to read */ + clamp_line_coordinates(direction, current_plane, &src_line, &src_x_start,= &src_y_start, + &dst_x_start, &pixel_count); + + if (pixel_count <=3D 0) { + /* Nothing to read, so avoid multiple function calls */ + return; + } + + /* + * Modify the starting point to take in account the rotation + * + * src_line is the top-left corner, so when reading READ_RIGHT_TO_LEFT or + * READ_BOTTOM_TO_TOP, it must be changed to the top-right/bottom-left + * corner. + */ + if (direction =3D=3D READ_RIGHT_TO_LEFT) { + // src_x_start is now the right point + src_x_start +=3D pixel_count - 1; + } else if (direction =3D=3D READ_BOTTOM_TO_TOP) { + // src_y_start is now the bottom point + src_y_start +=3D pixel_count - 1; + } + + /* + * Perform the conversion and the blending + * + * Here we know that the read line (x_start, y_start, pixel_count) is + * inside the source buffer [2] and we don't write outside the stage + * buffer [1]. + */ + current_plane->pixel_read_line(current_plane, src_x_start, src_y_start, d= irection, + pixel_count, &stage_buffer->pixels[dst_x_start]); + + pre_mul_alpha_blend(stage_buffer, output_buffer, + dst_x_start, pixel_count); +} + /** * blend - blend the pixels from all planes and compute crc * @wb: The writeback frame buffer metadata @@ -223,34 +372,25 @@ 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, x_dst, pixel_count; =20 const struct pixel_argb_u16 background_color =3D { .a =3D 0xffff }; =20 - size_t crtc_y_limit =3D crtc_state->base.crtc->mode.vdisplay; + int crtc_y_limit =3D crtc_state->base.crtc->mode.vdisplay; + int crtc_x_limit =3D crtc_state->base.crtc->mode.hdisplay; =20 /* * The planes are composed line-by-line to avoid heavy memory usage. It i= s a necessary * complexity to avoid poor blending performance. * - * The function vkms_compose_row() is used to read a line, pixel-by-pixel= , into the staging - * buffer. + * The function pixel_read_line callback is used to read a line, using an= efficient + * algorithm for a specific format, into the staging buffer. */ - for (size_t y =3D 0; y < crtc_y_limit; y++) { + for (int y =3D 0; y < crtc_y_limit; y++) { fill_background(&background_color, output_buffer); =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); - - if (!check_limit(plane[i]->frame_info, y_pos)) - continue; - - vkms_compose_row(stage_buffer, plane[i], y_pos); - pre_mul_alpha_blend(stage_buffer, output_buffer, x_dst, pixel_count); + blend_line(plane[i], y, crtc_x_limit, stage_buffer, output_buffer); } =20 apply_lut(crtc_state, output_buffer); @@ -258,7 +398,7 @@ static void blend(struct vkms_writeback_job *wb, *crc32 =3D crc32_le(*crc32, (void *)output_buffer->pixels, row_size); =20 if (wb) - vkms_writeback_row(wb, output_buffer, y_pos); + vkms_writeback_row(wb, output_buffer, y); } } =20 @@ -269,7 +409,7 @@ static int check_format_funcs(struct vkms_crtc_state *c= rtc_state, u32 n_active_planes =3D crtc_state->num_active_planes; =20 for (size_t i =3D 0; i < n_active_planes; i++) - if (!planes[i]->pixel_read) + if (!planes[i]->pixel_read_line) return -1; =20 if (active_wb && !active_wb->pixel_write) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 777b7bd91f27..067a4797f7a0 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -39,7 +39,6 @@ struct vkms_frame_info { struct drm_framebuffer *fb; struct drm_rect src, dst; - struct drm_rect rotated; struct iosys_map map[DRM_FORMAT_MAX_PLANES]; unsigned int rotation; }; @@ -80,26 +79,38 @@ enum pixel_read_direction { READ_LEFT_TO_RIGHT }; =20 +struct vkms_plane_state; + /** - * typedef pixel_read_t - These functions are used to read a pixel in the = source frame, + * typedef pixel_read_line_t - These functions are used to read a pixel li= ne in the source frame, * convert it to `struct pixel_argb_u16` and write it to @out_pixel. * - * @in_pixel: pointer to the pixel to read - * @out_pixel: pointer to write the converted pixel + * @plane: plane used as source for the pixel value + * @x_start: X (width) coordinate of the first pixel to copy. The caller m= ust ensure that x_start + * is non-negative and smaller than @plane->frame_info->fb->width. + * @y_start: Y (height) coordinate of the first pixel to copy. The caller = must ensure that y_start + * is non-negative and smaller than @plane->frame_info->fb->height. + * @direction: direction to use for the copy, starting at @x_start/@y_start + * @count: number of pixels to copy + * @out_pixel: pointer where to write the pixel values. They will be writt= en from @out_pixel[0] + * (included) to @out_pixel[@count] (excluded). The caller must ensure tha= t out_pixel have a + * length of at least @count. */ -typedef void (*pixel_read_t)(const u8 *in_pixel, struct pixel_argb_u16 *ou= t_pixel); +typedef void (*pixel_read_line_t)(const struct vkms_plane_state *plane, in= t x_start, + int y_start, enum pixel_read_direction direction, int count, + struct pixel_argb_u16 out_pixel[]); =20 /** * struct vkms_plane_state - Driver specific plane state * @base: base plane state * @frame_info: data required for composing computation - * @pixel_read: function to read a pixel in this plane. The creator of a s= truct vkms_plane_state - * must ensure that this pointer is valid + * @pixel_read_line: function to read a pixel line in this plane. The crea= tor of a + * struct vkms_plane_state must ensure that this pointer is valid */ struct vkms_plane_state { struct drm_shadow_plane_state base; struct vkms_frame_info *frame_info; - pixel_read_t pixel_read; + pixel_read_line_t pixel_read_line; }; =20 struct vkms_plane { @@ -265,7 +276,6 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const= char *source_name, /* Composer Support */ void vkms_composer_worker(struct work_struct *work); void vkms_set_composer(struct vkms_output *out, bool enabled); -void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_= state *plane, int y); void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_b= uffer *src_buffer, int y); =20 /* Writeback */ diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index d0e7dfc1f0d3..0f6678420a11 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -140,83 +140,51 @@ static void packed_pixels_addr_1x1(const struct vkms_= frame_info *frame_info, *addr =3D (u8 *)frame_info->map[0].vaddr + offset; } =20 -static void *get_packed_src_addr(const struct vkms_frame_info *frame_info,= int y, - int plane_index) -{ - int x_src =3D frame_info->src.x1 >> 16; - int y_src =3D y - frame_info->rotated.y1 + (frame_info->src.y1 >> 16); - u8 *addr; - int rem_x, rem_y; - - WARN_ONCE(drm_format_info_block_width(frame_info->fb->format, plane_index= ) !=3D 1, - "%s() only support formats with block_w =3D=3D 1", __func__); - WARN_ONCE(drm_format_info_block_height(frame_info->fb->format, plane_inde= x) !=3D 1, - "%s() only support formats with block_h =3D=3D 1", __func__); - - packed_pixels_addr(frame_info, x_src, y_src, plane_index, &addr, &rem_x, = &rem_y); - - return addr; -} - -static int get_x_position(const struct vkms_frame_info *frame_info, int li= mit, int x) -{ - if (frame_info->rotation & (DRM_MODE_REFLECT_X | DRM_MODE_ROTATE_270)) - return limit - x - 1; - return x; -} - /* - * The following functions take pixel data from the buffer and convert the= m to the format - * ARGB16161616 in @out_pixel. + * The following functions take pixel data (a, r, g, b, pixel, ...) and co= nvert them to + * &struct pixel_argb_u16 * - * They are used in the vkms_compose_row() function to handle multiple for= mats. + * They are used in the `read_line`s functions to avoid duplicate work for= some pixel formats. */ =20 -static void ARGB8888_to_argb_u16(const u8 *in_pixel, struct pixel_argb_u16= *out_pixel) +static struct pixel_argb_u16 argb_u16_from_u8888(u8 a, u8 r, u8 g, u8 b) { + struct pixel_argb_u16 out_pixel; /* * The 257 is the "conversion ratio". This number is obtained by the * (2^16 - 1) / (2^8 - 1) division. Which, in this case, tries to get * the best color value in a pixel format with more possibilities. * A similar idea applies to others RGB color conversions. */ - out_pixel->a =3D (u16)in_pixel[3] * 257; - out_pixel->r =3D (u16)in_pixel[2] * 257; - out_pixel->g =3D (u16)in_pixel[1] * 257; - out_pixel->b =3D (u16)in_pixel[0] * 257; -} + out_pixel.a =3D (u16)a * 257; + out_pixel.r =3D (u16)r * 257; + out_pixel.g =3D (u16)g * 257; + out_pixel.b =3D (u16)b * 257; =20 -static void XRGB8888_to_argb_u16(const u8 *in_pixel, struct pixel_argb_u16= *out_pixel) -{ - out_pixel->a =3D (u16)0xffff; - out_pixel->r =3D (u16)in_pixel[2] * 257; - out_pixel->g =3D (u16)in_pixel[1] * 257; - out_pixel->b =3D (u16)in_pixel[0] * 257; + return out_pixel; } =20 -static void ARGB16161616_to_argb_u16(const u8 *in_pixel, struct pixel_argb= _u16 *out_pixel) +static struct pixel_argb_u16 argb_u16_from_u16161616(u16 a, u16 r, u16 g, = u16 b) { - __le16 *pixel =3D (__le16 *)in_pixel; + struct pixel_argb_u16 out_pixel; + + out_pixel.a =3D a; + out_pixel.r =3D r; + out_pixel.g =3D g; + out_pixel.b =3D b; =20 - out_pixel->a =3D le16_to_cpu(pixel[3]); - out_pixel->r =3D le16_to_cpu(pixel[2]); - out_pixel->g =3D le16_to_cpu(pixel[1]); - out_pixel->b =3D le16_to_cpu(pixel[0]); + return out_pixel; } =20 -static void XRGB16161616_to_argb_u16(const u8 *in_pixel, struct pixel_argb= _u16 *out_pixel) +static struct pixel_argb_u16 argb_u16_from_le16161616(__le16 a, __le16 r, = __le16 g, __le16 b) { - __le16 *pixel =3D (__le16 *)in_pixel; - - out_pixel->a =3D (u16)0xffff; - out_pixel->r =3D le16_to_cpu(pixel[2]); - out_pixel->g =3D le16_to_cpu(pixel[1]); - out_pixel->b =3D le16_to_cpu(pixel[0]); + return argb_u16_from_u16161616(le16_to_cpu(a), le16_to_cpu(r), le16_to_cp= u(g), + le16_to_cpu(b)); } =20 -static void RGB565_to_argb_u16(const u8 *in_pixel, struct pixel_argb_u16 *= out_pixel) +static struct pixel_argb_u16 argb_u16_from_RGB565(const __le16 *pixel) { - __le16 *pixel =3D (__le16 *)in_pixel; + struct pixel_argb_u16 out_pixel; =20 s64 fp_rb_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(31)); s64 fp_g_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(63)); @@ -226,40 +194,120 @@ static void RGB565_to_argb_u16(const u8 *in_pixel, s= truct pixel_argb_u16 *out_pi s64 fp_g =3D drm_int2fixp((rgb_565 >> 5) & 0x3f); s64 fp_b =3D drm_int2fixp(rgb_565 & 0x1f); =20 - out_pixel->a =3D (u16)0xffff; - out_pixel->r =3D drm_fixp2int_round(drm_fixp_mul(fp_r, fp_rb_ratio)); - out_pixel->g =3D drm_fixp2int_round(drm_fixp_mul(fp_g, fp_g_ratio)); - out_pixel->b =3D drm_fixp2int_round(drm_fixp_mul(fp_b, fp_rb_ratio)); + out_pixel.a =3D (u16)0xffff; + out_pixel.r =3D drm_fixp2int_round(drm_fixp_mul(fp_r, fp_rb_ratio)); + out_pixel.g =3D drm_fixp2int_round(drm_fixp_mul(fp_g, fp_g_ratio)); + out_pixel.b =3D drm_fixp2int_round(drm_fixp_mul(fp_b, fp_rb_ratio)); + + return out_pixel; } =20 -/** - * vkms_compose_row - compose a single row of a plane - * @stage_buffer: output line with the composed pixels - * @plane: state of the plane that is being composed - * @y: y coordinate of the row +/* + * The following functions are read_line function for each pixel format su= pported by VKMS. + * + * They read a line starting at the point @x_start,@y_start following the = @direction. The result + * is stored in @out_pixel and in the format ARGB16161616. + * + * These functions are very repetitive, but the innermost pixel loops must= be kept inside these + * functions for performance reasons. Some benchmarking was done in [1] wh= ere having the innermost + * loop factored out of these functions showed a slowdown by a factor of t= hree. * - * This function composes a single row of a plane. It gets the source pixe= ls - * through the y coordinate (see get_packed_src_addr()) and goes linearly - * through the source pixel, reading the pixels and converting it to - * ARGB16161616 (see the pixel_read() callback). For rotate-90 and rotate-= 270, - * the source pixels are not traversed linearly. The source pixels are que= ried - * on each iteration in order to traverse the pixels vertically. + * [1]: https://lore.kernel.org/dri-devel/d258c8dc-78e9-4509-9037-a98f7f33= b3a3@riseup.net/ */ -void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_= state *plane, int y) + +static void ARGB8888_read_line(const struct vkms_plane_state *plane, int x= _start, int y_start, + enum pixel_read_direction direction, int count, + struct pixel_argb_u16 out_pixel[]) { - struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; - struct vkms_frame_info *frame_info =3D plane->frame_info; - u8 *src_pixels =3D get_packed_src_addr(frame_info, y, 0); - int limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), stage_buffe= r->n_pixels); + struct pixel_argb_u16 *end =3D out_pixel + count; + u8 *src_pixels; + + packed_pixels_addr_1x1(plane->frame_info, x_start, y_start, 0, &src_pixel= s); + + int step =3D get_block_step_bytes(plane->frame_info->fb, direction, 0); + + while (out_pixel < end) { + u8 *px =3D (u8 *)src_pixels; + *out_pixel =3D argb_u16_from_u8888(px[3], px[2], px[1], px[0]); + out_pixel +=3D 1; + src_pixels +=3D step; + } +} + +static void XRGB8888_read_line(const struct vkms_plane_state *plane, int x= _start, int y_start, + enum pixel_read_direction direction, int count, + struct pixel_argb_u16 out_pixel[]) +{ + struct pixel_argb_u16 *end =3D out_pixel + count; + u8 *src_pixels; + + packed_pixels_addr_1x1(plane->frame_info, x_start, y_start, 0, &src_pixel= s); + + int step =3D get_block_step_bytes(plane->frame_info->fb, direction, 0); + + while (out_pixel < end) { + u8 *px =3D (u8 *)src_pixels; + *out_pixel =3D argb_u16_from_u8888(255, px[2], px[1], px[0]); + out_pixel +=3D 1; + src_pixels +=3D step; + } +} + +static void ARGB16161616_read_line(const struct vkms_plane_state *plane, i= nt x_start, + int y_start, enum pixel_read_direction direction, int count, + struct pixel_argb_u16 out_pixel[]) +{ + struct pixel_argb_u16 *end =3D out_pixel + count; + u8 *src_pixels; + + packed_pixels_addr_1x1(plane->frame_info, x_start, y_start, 0, &src_pixel= s); + + int step =3D get_block_step_bytes(plane->frame_info->fb, direction, 0); + + while (out_pixel < end) { + u16 *px =3D (u16 *)src_pixels; + *out_pixel =3D argb_u16_from_u16161616(px[3], px[2], px[1], px[0]); + out_pixel +=3D 1; + src_pixels +=3D step; + } +} + +static void XRGB16161616_read_line(const struct vkms_plane_state *plane, i= nt x_start, + int y_start, enum pixel_read_direction direction, int count, + struct pixel_argb_u16 out_pixel[]) +{ + struct pixel_argb_u16 *end =3D out_pixel + count; + u8 *src_pixels; + + packed_pixels_addr_1x1(plane->frame_info, x_start, y_start, 0, &src_pixel= s); + + int step =3D get_block_step_bytes(plane->frame_info->fb, direction, 0); + + while (out_pixel < end) { + __le16 *px =3D (__le16 *)src_pixels; + *out_pixel =3D argb_u16_from_le16161616(cpu_to_le16(0xFFFF), px[2], px[1= ], px[0]); + out_pixel +=3D 1; + src_pixels +=3D step; + } +} + +static void RGB565_read_line(const struct vkms_plane_state *plane, int x_s= tart, + int y_start, enum pixel_read_direction direction, int count, + struct pixel_argb_u16 out_pixel[]) +{ + struct pixel_argb_u16 *end =3D out_pixel + count; + u8 *src_pixels; + + packed_pixels_addr_1x1(plane->frame_info, x_start, y_start, 0, &src_pixel= s); =20 - for (size_t x =3D 0; x < limit; x++, src_pixels +=3D frame_info->fb->form= at->cpp[0]) { - int x_pos =3D get_x_position(frame_info, limit, x); + int step =3D get_block_step_bytes(plane->frame_info->fb, direction, 0); =20 - if (drm_rotation_90_or_270(frame_info->rotation)) - src_pixels =3D get_packed_src_addr(frame_info, x + frame_info->rotated.= y1, 0) - + frame_info->fb->format->cpp[0] * y; + while (out_pixel < end) { + __le16 *px =3D (__le16 *)src_pixels; =20 - plane->pixel_read(src_pixels, &out_pixels[x_pos]); + *out_pixel =3D argb_u16_from_RGB565(px); + out_pixel +=3D 1; + src_pixels +=3D step; } } =20 @@ -359,25 +407,25 @@ void vkms_writeback_row(struct vkms_writeback_job *wb, } =20 /** - * get_pixel_read_function() - Retrieve the correct read_pixel function fo= r a specific + * get_pixel_read_line_function() - Retrieve the correct read_line functio= n for a specific * format. The returned pointer is NULL for unsupported pixel formats. The= caller must ensure that * the pointer is valid before using it in a vkms_plane_state. * * @format: DRM_FORMAT_* value for which to obtain a conversion function (= see [drm_fourcc.h]) */ -pixel_read_t get_pixel_read_function(u32 format) +pixel_read_line_t get_pixel_read_line_function(u32 format) { switch (format) { case DRM_FORMAT_ARGB8888: - return &ARGB8888_to_argb_u16; + return &ARGB8888_read_line; case DRM_FORMAT_XRGB8888: - return &XRGB8888_to_argb_u16; + return &XRGB8888_read_line; case DRM_FORMAT_ARGB16161616: - return &ARGB16161616_to_argb_u16; + return &ARGB16161616_read_line; case DRM_FORMAT_XRGB16161616: - return &XRGB16161616_to_argb_u16; + return &XRGB16161616_read_line; case DRM_FORMAT_RGB565: - return &RGB565_to_argb_u16; + return &RGB565_read_line; default: /* * This is a bug in vkms_plane_atomic_check(). All the supported diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkm= s_formats.h index 3ecea4563254..8d2bef95ff79 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.h +++ b/drivers/gpu/drm/vkms/vkms_formats.h @@ -5,7 +5,7 @@ =20 #include "vkms_drv.h" =20 -pixel_read_t get_pixel_read_function(u32 format); +pixel_read_line_t get_pixel_read_line_function(u32 format); =20 pixel_write_t get_pixel_write_function(u32 format); =20 diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index 10e9b23dab28..8875bed76410 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -112,7 +112,6 @@ static void vkms_plane_atomic_update(struct drm_plane *= plane, frame_info =3D vkms_plane_state->frame_info; memcpy(&frame_info->src, &new_state->src, sizeof(struct drm_rect)); memcpy(&frame_info->dst, &new_state->dst, sizeof(struct drm_rect)); - memcpy(&frame_info->rotated, &new_state->dst, sizeof(struct drm_rect)); frame_info->fb =3D fb; memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->ma= p)); drm_framebuffer_get(frame_info->fb); @@ -122,10 +121,8 @@ static void vkms_plane_atomic_update(struct drm_plane = *plane, DRM_MODE_REFLECT_X | DRM_MODE_REFLECT_Y); =20 - drm_rect_rotate(&frame_info->rotated, drm_rect_width(&frame_info->rotated= ), - drm_rect_height(&frame_info->rotated), frame_info->rotation); =20 - vkms_plane_state->pixel_read =3D get_pixel_read_function(fmt); + vkms_plane_state->pixel_read_line =3D get_pixel_read_line_function(fmt); } =20 static int vkms_plane_atomic_check(struct drm_plane *plane, --=20 2.46.2 From nobody Sun Nov 24 23:35:23 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (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 747F91CC147; Thu, 31 Oct 2024 17:53:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397235; cv=none; b=RFMCKQNFXh55Zj6KKNxjI5aXaC7JKFiP5aK32qD7q6CX0ty9wpPlKo7eidPqfJcHztykIySSM/LwthJHSRtXie2FHtDb9XFv9KlfJSkN/jtQUt/gVGdA8va76fqeqxwTQvCntMeAhtTNU/ZAC/X0T2PpPFXXjf9Dys6Q/5Zq6jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730397235; c=relaxed/simple; bh=uUawjcWkSnRz6+496bAdLII+36tesOT/CJyAg3irReg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IMHc8vqmcFtCwRDrEwpMaJPIZiAk8LYLwuyuZaZyR6U4oDktYfNhrcJy4/mc2meuqeW84qg+gHzo86NCkqX+T0NrCcMZ8raClm+OVRcxCJLAgBaYOwH44Qlyk0VUQ3kzqhg4n0i5H830Y7oygYr+nYRxBGtqAE60bdk8/SDZGvI= 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=AOQv+Joq; arc=none smtp.client-ip=217.70.183.196 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="AOQv+Joq" Received: by mail.gandi.net (Postfix) with ESMTPSA id BC605E000D; Thu, 31 Oct 2024 17:53:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730397230; 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=GXNtTQEa6PQ4chY1V5pewNIjVgXipIVtKBwRPGWAEjI=; b=AOQv+JoqdeBdR9LhtvG0FYdrbRVCQS2yj37mB7CmHxeWGx4TASDwktx2HmE1K1LHkjK5Ln DgRCbs22iUbyYHZEHAVVKzkEknGlMmMzNrvP0BWYZ8cXm4iRDknM1ZEgV7abHRElC1w17r +HlYu8+0nPESVaKH/vBiaG4ua5pBqjDm0DgPhJHyLCnDVOwwfg7Fqibo+/Wq1Y3qVMf1wd BcThCt4AdWsbKUew12TQrzWBoqT0kSiy2mQL7UyTvYde1vHfJJ92JROw8eGclTOL3G6syf FOecWfcUd2ZmmyokGFeENCWqX6kRAD9/Vm2PBR6Uex0yt2xRhKrOhl9hlQmO0A== From: Louis Chauvet Date: Thu, 31 Oct 2024 18:53:33 +0100 Subject: [PATCH v13 9/9] drm/vkms: Remove useless drm_rotation_simplify 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: <20241031-yuv-v13-9-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=1132; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=uUawjcWkSnRz6+496bAdLII+36tesOT/CJyAg3irReg=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnI8Qdxj/4TIdGSmYfMyWUFQIdhiq6KblD+ndAp eBco+NBw5+JAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZyPEHQAKCRAgrS7GWxAs 4nN+D/0Y/PPTh8mB2hpdcBh8KHUn5+3unK7HT1v3J+RNHjd8DFXSJXb8yOeCyC1xjNBOWyPqDOf mbRdhBItZXGKGC9fEivrH5VaHHKCRrCtOVMQsdWsLAvupBlVu5VALJmFl2FoVqLmXXg/kWDFUH+ Y3ArXklQC/NupCY5+bq9M4OlhfCvEoVjPbzfnoiqfs6zy6LTNQIErZXkl71Qf6Fg2pAPdN7ikVK ml4XfsjEFisl17wOmZu1fpg4hjHDZ9a3RseXwuk16g6TJgZKAed4qTw3PVRB2umelRfjxuSQncc 7JOuLNPGTaFQ1V/vRl0jviqBhQmIiZ9+ym5E3SLqir1tS4WPVk0OsLZzL2Gjie3LmMJjouo8UpF UEPIWRChQGrSG/Pis0nuGBxEhElK+Q4xh2ltBO+xZimEp7HknoBxTXmxyLTMkbwIOMDR1O5zxcE ++seqV41DGbzGt/mwpXjNeHIpfvg4LirIJcHbq22oiOmYJKoFktFoLYSql+T4jLf/0pJ9TKvXvL SWBv6Aotea1qFEDZBuKbZp1rZ9ZTRuywXwAlQtf/CWtiC6RvSZSNnoausL16h6PkeK1GxrhR7XR ICw2WxUAPzK6Z7tnyOEJ+2iF3u+gw/CksZjKfjgTJBCaIaJSRC3tYwarfs5Fff7UkM8/09jns0N j47XNRFTd3JQhTw== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com As all the rotation are now supported by VKMS, this simplification does not make sense anymore, so remove it. Acked-by: Ma=C3=ADra Canal Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- drivers/gpu/drm/vkms/vkms_plane.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index 8875bed76410..5a028ee96c91 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -115,12 +115,7 @@ static void vkms_plane_atomic_update(struct drm_plane = *plane, frame_info->fb =3D fb; memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->ma= p)); drm_framebuffer_get(frame_info->fb); - frame_info->rotation =3D drm_rotation_simplify(new_state->rotation, DRM_M= ODE_ROTATE_0 | - DRM_MODE_ROTATE_90 | - DRM_MODE_ROTATE_270 | - DRM_MODE_REFLECT_X | - DRM_MODE_REFLECT_Y); - + frame_info->rotation =3D new_state->rotation; =20 vkms_plane_state->pixel_read_line =3D get_pixel_read_line_function(fmt); } --=20 2.46.2