From patchwork Thu Aug 24 15:08:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 136855 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp1247021vqm; Thu, 24 Aug 2023 09:43:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFy9M9GlTc3kYHpNuuDT6ovWjmZif7CXfUgUbB31wl2Z/yR3zQxncSYP5DtjRdcYHcW5rTE X-Received: by 2002:a05:6a21:819f:b0:14b:b42c:349d with SMTP id pd31-20020a056a21819f00b0014bb42c349dmr4417903pzb.9.1692895384662; Thu, 24 Aug 2023 09:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692895384; cv=none; d=google.com; s=arc-20160816; b=ZCY3Ppr2F+75tgCK+VEZTo1uaEHZ8d6koQFbTVKe5G/f3sU3C2fz33NdQ+1C8CFAaA wDj61tf0H7q7E0l7FijAvtpCOomXmpP6cd6OdIRxMhxs9DUxMne0FLl+L2g7dxno0RGR vVq5NR7Y0cCczdo0lMICjHigBoxu1VNG6fggohTPqhzsJlW08UPHrkpVk8kkPtFUVXFf iVuIdB3IBBqLpDTI1KOqN0HGVE/0LW9qBJ/HdEyYpnwLRN05/H+f6zMAEbRMPDXhCKTl K6D6Pe/lTifXyn/0BUYJwDet8PY3zdHhCbHWCOqLthTk8XMgxJ5lHLTql+0mC+PUqpJb 24yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=F3mgGDmKlvrQAc4vcLenU3r31b5MLpSGLfO52hZoUiQ=; fh=wcJXU+GRAJ+lFf7so8itXL2pGJ6fujr2XomH/f1be3s=; b=EpGZLlYaIoO+Noa0SW/sNKBn2UPjEamb9ou+3eDaJUg76bGk5wv7sIcmB5J4R/AKjv vQlW4G7a+ROJgzhVppy0IoiDxTNmmvMzVl1yRZTx15quOzerjgSm8QARaOBpQN8EvT3U ShQG0EZ8BARSIjyYUnEXDrs7pg3n+yj8ZnMUqAPjN8ktLyAUdSWEyFrWNWD6E75B7ljj HrmVrTv2r+XYm5isDOujXswsoDjnXECLhHzX2SaLyYkYuHA6xkkyQCIeV0kVjCOQJyOy kh3FtfhR9njuE9oe5+vOeF96PTeOVFfyLQrWG8+bvTvjILkdTIOjYTk4jJI0RzSAc2LA cieQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e8-20020a656488000000b00565e386ff40si13132838pgv.744.2023.08.24.09.42.51; Thu, 24 Aug 2023 09:43:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242119AbjHXPJI (ORCPT + 99 others); Thu, 24 Aug 2023 11:09:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242155AbjHXPJA (ORCPT ); Thu, 24 Aug 2023 11:09:00 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02EA519B7 for ; Thu, 24 Aug 2023 08:08:56 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:3c6b:f703:5ab5:f36d]) by baptiste.telenet-ops.be with bizsmtp id dT8t2A00A01sfPQ01T8tZX; Thu, 24 Aug 2023 17:08:53 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qZBwx-001dhM-Hn; Thu, 24 Aug 2023 17:08:53 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qZBx7-000Vz0-77; Thu, 24 Aug 2023 17:08:53 +0200 From: Geert Uytterhoeven To: Javier Martinez Canillas , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 5/8] drm/client: Convert drm_client_buffer_addfb() to drm_mode_addfb2() Date: Thu, 24 Aug 2023 17:08:43 +0200 Message-Id: <50762fd1694d3b5f6df1bdfa482564adb2ee7f36.1692888745.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775129470976915825 X-GMAIL-MSGID: 1775129470976915825 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 --- 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 037e36f2049c1793..0ced189befebae12 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 = buffer->client; - struct drm_mode_fb_cmd fb_req = { }; - const struct drm_format_info *info; + struct drm_mode_fb_cmd2 fb_req = { }; int ret; - info = drm_format_info(format); - fb_req.bpp = drm_format_info_bpp(info, 0); - fb_req.depth = info->depth; fb_req.width = width; fb_req.height = height; - fb_req.handle = handle; - fb_req.pitch = buffer->pitch; + fb_req.pixel_format = format; + fb_req.handles[0] = handle; + fb_req.pitches[0] = buffer->pitch; - ret = drm_mode_addfb(client->dev, &fb_req, client->file); + ret = drm_mode_addfb2(client->dev, &fb_req, client->file); if (ret) return ret;