From patchwork Sun Oct 15 14:27:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 153025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp2966979vqb; Sun, 15 Oct 2023 07:53:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFatiphX56e6+CEgBanRtB2vwfKly4hUz83qg5Ig3Up9Kt/CDYzCQvbiS49SWJKX14bWIMa X-Received: by 2002:a05:6a20:3d85:b0:163:f945:42c4 with SMTP id s5-20020a056a203d8500b00163f94542c4mr37684494pzi.1.1697381596897; Sun, 15 Oct 2023 07:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697381596; cv=none; d=google.com; s=arc-20160816; b=OLgtyqlhCcS2fccsx909Ask66IzfmxEPefwE0yJyf8hi5uktdDh6su9DsYj14wYtLm KARQAd2ilzS3aRYEQ9YBp68jwp4DeM3r3QrqmV5REeCzazo3CQ939rFami0JgcZrQjY1 9oazSfebOEQc6QEpkbhh69qG4817Mu+/8A3Ud6H/PO6naUZwBnzEA9S4L9rIpXnWLU9c sfsW4DPPR4W14TFToJ+jBq8mExE9U5b3wm1Y4pkEgFRYAhTKjL2ailV4buM+Uby37xFW puXsP4ifZQvVePAYtSYfohBxGKoISEJ9OddTBjgn7+MGCcgkQmTiIDyAqcfW0jxGd0Py pPXg== 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 :message-id:date:subject:cc:to:from; bh=ZCEaZYGWu3SeTV/W7BoTUFnPM+7uUf8LbWp+Up5SX70=; fh=U7VVc4RAjRrybN7HA6/7aaYRwiNdj2v/kT9x2K8rdY8=; b=D3CbfDUhQ8ZY3Jl1Vtsk6eCM0IK+PptM+CZL1gZzadgQ6DrMfgMI6OGV5AjB69CVvH dW2bCochmK7xFk288orV1khugQAq54PWE/MSA/+Yo3LQ+WApzsYm7M/ByLnSO0xyBdFX gx3RggysA7JuURTbDlJGPCkH3/ML7cV65uQatI8WAzC4zzK/qoBn8wI5ag0jmWdAaa88 BSceAlrcnques5bOCkW7ApZhJMV6iortAff24RHl774UveSFJcU5dXvRShfowmuKqMn9 NMbBxPAVaOkGvcLhhpnbju4OZx4KzhjPTYjxEoQZzp6IdznPoxd3d3xEzEyFVB9L11jU EZMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id by11-20020a056a02058b00b005b02161841fsi4662744pgb.277.2023.10.15.07.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 07:53:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 0367A805A7E9; Sun, 15 Oct 2023 07:53:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229772AbjJOO1M (ORCPT + 19 others); 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 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 15 Oct 2023 07:53:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779833605438464563 X-GMAIL-MSGID: 1779833605438464563 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 = 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;