From nobody Fri Jan 2 05:01:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A73ECDB47E for ; Sun, 15 Oct 2023 14:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbjJOO1M (ORCPT ); Sun, 15 Oct 2023 10:27:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjJOO1L (ORCPT ); Sun, 15 Oct 2023 10:27:11 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83A8BA3 for ; Sun, 15 Oct 2023 07:27:09 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:441e:d899:20f9:b692]) by xavier.telenet-ops.be with bizsmtp id yET62A00B0qPBYQ01ET6N8; Sun, 15 Oct 2023 16:27:07 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qs258-006eyF-Ll; Sun, 15 Oct 2023 16:27:06 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qs25C-002gOf-1v; Sun, 15 Oct 2023 16:27:06 +0200 From: Geert Uytterhoeven To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Javier Martinez Canillas Subject: [PATCH v3] drm/client: Convert drm_client_buffer_addfb() to drm_mode_addfb2() Date: Sun, 15 Oct 2023 16:27:04 +0200 Message-Id: <4b84adfc686288714e69d0442d22f1259ff74903.1697379891.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently drm_client_buffer_addfb() uses the legacy drm_mode_addfb(), which uses bpp and depth to guess the wanted buffer format. However, drm_client_buffer_addfb() already knows the exact buffer format, so there is no need to convert back and forth between buffer format and bpp/depth, and the function can just call drm_mode_addfb2() directly instead. Signed-off-by: Geert Uytterhoeven Reviewed-by: Javier Martinez Canillas Tested-by: Javier Martinez Canillas --- v3: - Extract from series "[PATCH v2 0/8] drm: fb-helper/ssd130x: Add support for DRM_FORMAT_R1" (https://lore.kernel.org/all/cover.1692888745.git.geert@linux-m68k.org), as this patch has merits on its own, v2: - Add Reviewed-by, Tested-by, - s/drm_mode_create_dumb/drm_client_buffer_addfb/ in one-line summary. --- drivers/gpu/drm/drm_client.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c index d4296440f297fc5a..a780832a0963fe38 100644 --- a/drivers/gpu/drm/drm_client.c +++ b/drivers/gpu/drm/drm_client.c @@ -395,19 +395,16 @@ static int drm_client_buffer_addfb(struct drm_client_= buffer *buffer, u32 handle) { struct drm_client_dev *client =3D buffer->client; - struct drm_mode_fb_cmd fb_req =3D { }; - const struct drm_format_info *info; + struct drm_mode_fb_cmd2 fb_req =3D { }; int ret; =20 - info =3D drm_format_info(format); - fb_req.bpp =3D drm_format_info_bpp(info, 0); - fb_req.depth =3D info->depth; fb_req.width =3D width; fb_req.height =3D height; - fb_req.handle =3D handle; - fb_req.pitch =3D buffer->pitch; + fb_req.pixel_format =3D format; + fb_req.handles[0] =3D handle; + fb_req.pitches[0] =3D buffer->pitch; =20 - ret =3D drm_mode_addfb(client->dev, &fb_req, client->file); + ret =3D drm_mode_addfb2(client->dev, &fb_req, client->file); if (ret) return ret; =20 --=20 2.34.1