From patchwork Tue Feb 18 14:23:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13979920 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 81DF8C021AE for ; Tue, 18 Feb 2025 14:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OtJUCWEHw+14ORuGTXQAAZfJi6HcPz/7NU2pawYSiMk=; b=WtGCEvEmz1oQQ8 1SdX/TiqxcLiLSaC8IzbGsXO9bFP/m+4x16TF+eZ8A1YYar1c9tm8KPTWfJ2BEEQLZQMq9GYJeF0w DYLrG9xiwBKhFOa8QHh+63bgmkuWvlfcnBtzRLcygKz3HBtFOKB4Q9u0oM5/1P+UCnFv2eaRwAkUk ZQdi30vu7/QUyjDMmYL5q6FIQP2smNYfPAW5ZIwoxa/fKj7a/Ldtah8nwWaaSaKhzE3HqONUkXKs5 Q6b3SUJnPTHTdWbN3rv0RRnpkdSdt5uowTm6TuHKCo9g9vnZJX0qvEXDZub0Q+6TOYrEBxMddWWWG SyMr2u/5EAD9wqFsJ99w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkOYs-00000008WC2-1qqX; Tue, 18 Feb 2025 14:26:58 +0000 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkOY9-00000008V7b-1CYd for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 14:26:15 +0000 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5107021174; Tue, 18 Feb 2025 14:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739888750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXuM/yHsTCUB4pwTUmF0VQtFRVfSwmsyhh/j/8nZR+s=; b=pp7+wGCPGBjdN0uBbenUqt/EgvJXBajIvHMb8x/jbst3Z8fvoHB8jy70yJdoQqJcdhgP2i thXH/yvc39OoXr1FEoyh0E9SlAQDW1AKUgunyfie3bs3wlDMWjzRVjC0Ol2l2V/8OOZhyl e0n35AmKvUTSLmeI4XBLmVWFvjm6URA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739888750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXuM/yHsTCUB4pwTUmF0VQtFRVfSwmsyhh/j/8nZR+s=; b=aT5QpKyp7xy9QC6Y4DGLamilttDLSVoGLeT/eO8jSx+8SZlHk4DAPStUVWavVuHuelNDYE T483RDyzsQgJgcAw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=pp7+wGCP; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=aT5QpKyp DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1739888750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXuM/yHsTCUB4pwTUmF0VQtFRVfSwmsyhh/j/8nZR+s=; b=pp7+wGCPGBjdN0uBbenUqt/EgvJXBajIvHMb8x/jbst3Z8fvoHB8jy70yJdoQqJcdhgP2i thXH/yvc39OoXr1FEoyh0E9SlAQDW1AKUgunyfie3bs3wlDMWjzRVjC0Ol2l2V/8OOZhyl e0n35AmKvUTSLmeI4XBLmVWFvjm6URA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1739888750; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXuM/yHsTCUB4pwTUmF0VQtFRVfSwmsyhh/j/8nZR+s=; b=aT5QpKyp7xy9QC6Y4DGLamilttDLSVoGLeT/eO8jSx+8SZlHk4DAPStUVWavVuHuelNDYE T483RDyzsQgJgcAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CB520132C7; Tue, 18 Feb 2025 14:25:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2KxeMG2YtGdXYQAAD6G6ig (envelope-from ); Tue, 18 Feb 2025 14:25:49 +0000 From: Thomas Zimmermann To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, imx@lists.linux.dev, linux-samsung-soc@vger.kernel.org, nouveau@lists.freedesktop.org, virtualization@lists.linux.dev, spice-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org, intel-xe@lists.freedesktop.org, xen-devel@lists.xenproject.org, Thomas Zimmermann , Russell King Subject: [PATCH v3 06/25] drm/armada: Compute dumb-buffer sizes with drm_mode_size_dumb() Date: Tue, 18 Feb 2025 15:23:29 +0100 Message-ID: <20250218142542.438557-7-tzimmermann@suse.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218142542.438557-1-tzimmermann@suse.de> References: <20250218142542.438557-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5107021174 X-Rspamd-Action: no action X-Spamd-Result: default: False [-1.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; SUSPICIOUS_RECIPS(1.50)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_TO(0.00)[linux.intel.com,kernel.org,gmail.com,ffwll.ch]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[20]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[suse.de:+]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_062613_481757_F7D2E374 X-CRM114-Status: GOOD ( 10.92 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Call drm_mode_size_dumb() to compute dumb-buffer scanline pitch and buffer size. No alignment required. Signed-off-by: Thomas Zimmermann Cc: Russell King --- drivers/gpu/drm/armada/armada_gem.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 1a1680d71486..0f11ae06064a 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -9,6 +9,7 @@ #include #include +#include #include #include "armada_drm.h" @@ -244,14 +245,13 @@ int armada_gem_dumb_create(struct drm_file *file, struct drm_device *dev, struct drm_mode_create_dumb *args) { struct armada_gem_object *dobj; - u32 handle; - size_t size; int ret; - args->pitch = armada_pitch(args->width, args->bpp); - args->size = size = args->pitch * args->height; + ret = drm_mode_size_dumb(dev, args, 0, 0); + if (ret) + return ret; - dobj = armada_gem_alloc_private_object(dev, size); + dobj = armada_gem_alloc_private_object(dev, args->size); if (dobj == NULL) return -ENOMEM; @@ -259,14 +259,12 @@ int armada_gem_dumb_create(struct drm_file *file, struct drm_device *dev, if (ret) goto err; - ret = drm_gem_handle_create(file, &dobj->obj, &handle); + ret = drm_gem_handle_create(file, &dobj->obj, &args->handle); if (ret) goto err; - args->handle = handle; - /* drop reference from allocate - handle holds it now */ - DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle); + DRM_DEBUG_DRIVER("obj %p size %llu handle %#x\n", dobj, args->size, args->handle); err: drm_gem_object_put(&dobj->obj); return ret;