From patchwork Thu Jul 13 13:17:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 119886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1821193vqm; Thu, 13 Jul 2023 06:22:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlFr0ifENtUxVcYUexe/df+yl+pPUo0Mzg9jOCiRr1C6LFunlXud98m2CwcmjBO7VhAJnvzv X-Received: by 2002:a17:906:10d9:b0:993:eef2:5d59 with SMTP id v25-20020a17090610d900b00993eef25d59mr1816509ejv.0.1689254552113; Thu, 13 Jul 2023 06:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689254552; cv=none; d=google.com; s=arc-20160816; b=CvOHVIdko9jiL3ogbu2UOMZV1OqUWQ1c+mHd6Ro+JWzvPpwSOdCdEdzLVYjXPhEAKE AD+tPSei3xnKyK1EJQUZIlOZRyReFE3gWBFnxOINCXRtdsOeOODpzSwQuHVVvEHM8TDp JE4jggn9Z4tvUxIXROjoW3R7mWQc9eoJzpMoHHfyu+4A5gBqnRkou2Y2o1IGWBvcln9E cGLeaijDj7wWPyvIwirlCSujZBqP62KAGACj0qKY1pK9+n6gYmrTiJfc8cvLUNhygXG1 wZRZWLz4ndiGSg27aXBCoXCwbQvI4hHx9WTH5EcNlJZTS33tUbTw0e7r6XorkI/T1DN2 nbBA== 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=GG87n6OyM2fV+LRgWh5SL+C/GMDrJvGgagstcZ2HbjA=; fh=wcJXU+GRAJ+lFf7so8itXL2pGJ6fujr2XomH/f1be3s=; b=Bj/qJodkKsaq9pBedWS1yAkdo0xT0de7ufy887deUfwyRrnlh7JDUa+TsWn0K5Lt8U FQJjKMKMk9OSNEXv1w4jsP7fyL7ZwypnZxuLltJSsyQc9VF5eTF+JRkKas2kX2TCVGOc fIQ2wiiqu0w9nsI8AOe5gXzxzoI6PXLsHr0KLM3yNkLllaRY23P/icCPSmfdkFZ21GTQ ZFTIY2KCfYuzo+T1H6+yUPIEiLJIAUlm0uVd3e1u2mhio+E34bGmJUhVATqbMN5xyEw6 1j86r1qF9am4eTm6JRvK5gEHOcJzJh3g1CZyY90G9Ia7SgB3KKJOsRH8PMeeBzj24m3B kz7g== 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 d19-20020a170906345300b009932537925bsi6753811ejb.578.2023.07.13.06.22.07; Thu, 13 Jul 2023 06:22:32 -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 S234786AbjGMNRs (ORCPT + 99 others); Thu, 13 Jul 2023 09:17:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234802AbjGMNRb (ORCPT ); Thu, 13 Jul 2023 09:17:31 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A4042713 for ; Thu, 13 Jul 2023 06:17:25 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:6264:77e5:42e2:477d]) by laurent.telenet-ops.be with bizsmtp id LdHN2A00V3wy6xv01dHNpc; Thu, 13 Jul 2023 15:17:23 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qJwC3-001Gr1-2r; Thu, 13 Jul 2023 15:17:22 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qJwCA-00GWyl-PB; Thu, 13 Jul 2023 15:17:22 +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 5/8] drm/client: Convert drm_mode_create_dumb() to drm_mode_addfb2() Date: Thu, 13 Jul 2023 15:17:13 +0200 Message-Id: <9090c1b423e0b56c8e906155fe53ff0841830a03.1689252746.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,T_SCC_BODY_TEXT_LINE 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: 1771311781689837961 X-GMAIL-MSGID: 1771311781689837961 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 --- 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 f6292ba0e6fc3783..de660a25ad7c6f06 100644 --- a/drivers/gpu/drm/drm_client.c +++ b/drivers/gpu/drm/drm_client.c @@ -374,19 +374,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;