From nobody Mon Nov 25 02:51:56 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 --- 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