All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Zimmermann <tzimmermann@suse.de>
To: simona@ffwll.ch, airlied@gmail.com, mripard@kernel.org,
	maarten.lankhorst@linux.intel.com, geert@linux-m68k.org,
	tomi.valkeinen@ideasonboard.com
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" <tzimmermann@suse.de>,
	"Matthew Auld" <matthew.auld@intel.com>,
	"Lucas De Marchi" <lucas.demarchi@intel.com>,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Rodrigo Vivi" <rodrigo.vivi@intel.com>
Subject: [PATCH v4 23/25] drm/xe: Compute dumb-buffer sizes with drm_mode_size_dumb()
Date: Tue, 11 Mar 2025 16:47:27 +0100	[thread overview]
Message-ID: <20250311155120.442633-24-tzimmermann@suse.de> (raw)
In-Reply-To: <20250311155120.442633-1-tzimmermann@suse.de>

Call drm_mode_size_dumb() to compute dumb-buffer scanline pitch
and buffer size. Align the pitch to a multiple of 8. Align the
buffer size according to hardware requirements.

Xe's internal calculation allowed for 64-bit wide buffer sizes, but
the ioctl's internal checks always verified against 32-bit wide limits.
Hance, it is safe to limit the driver code to 32-bit calculations as
well.

v3:
- mention 32-bit calculation in commit description (Matthew)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/xe_bo.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 64f9c936eea0..471aab61176e 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -9,6 +9,7 @@
 #include <linux/nospec.h>
 
 #include <drm/drm_drv.h>
+#include <drm/drm_dumb_buffers.h>
 #include <drm/drm_gem_ttm_helper.h>
 #include <drm/drm_managed.h>
 #include <drm/ttm/ttm_backup.h>
@@ -2910,14 +2911,13 @@ int xe_bo_dumb_create(struct drm_file *file_priv,
 	struct xe_device *xe = to_xe_device(dev);
 	struct xe_bo *bo;
 	uint32_t handle;
-	int cpp = DIV_ROUND_UP(args->bpp, 8);
 	int err;
 	u32 page_size = max_t(u32, PAGE_SIZE,
 		xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K);
 
-	args->pitch = ALIGN(args->width * cpp, 64);
-	args->size = ALIGN(mul_u32_u32(args->pitch, args->height),
-			   page_size);
+	err = drm_mode_size_dumb(dev, args, SZ_64, page_size);
+	if (err)
+		return err;
 
 	bo = xe_bo_create_user(xe, NULL, NULL, args->size,
 			       DRM_XE_GEM_CPU_CACHING_WC,
-- 
2.48.1


WARNING: multiple messages have this Message-ID (diff)
From: Thomas Zimmermann <tzimmermann@suse.de>
To: simona@ffwll.ch, airlied@gmail.com, mripard@kernel.org,
	maarten.lankhorst@linux.intel.com, geert@linux-m68k.org,
	tomi.valkeinen@ideasonboard.com
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" <tzimmermann@suse.de>,
	"Matthew Auld" <matthew.auld@intel.com>,
	"Lucas De Marchi" <lucas.demarchi@intel.com>,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Rodrigo Vivi" <rodrigo.vivi@intel.com>
Subject: [PATCH v4 23/25] drm/xe: Compute dumb-buffer sizes with drm_mode_size_dumb()
Date: Tue, 11 Mar 2025 16:47:27 +0100	[thread overview]
Message-ID: <20250311155120.442633-24-tzimmermann@suse.de> (raw)
In-Reply-To: <20250311155120.442633-1-tzimmermann@suse.de>

Call drm_mode_size_dumb() to compute dumb-buffer scanline pitch
and buffer size. Align the pitch to a multiple of 8. Align the
buffer size according to hardware requirements.

Xe's internal calculation allowed for 64-bit wide buffer sizes, but
the ioctl's internal checks always verified against 32-bit wide limits.
Hance, it is safe to limit the driver code to 32-bit calculations as
well.

v3:
- mention 32-bit calculation in commit description (Matthew)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/xe_bo.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 64f9c936eea0..471aab61176e 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -9,6 +9,7 @@
 #include <linux/nospec.h>
 
 #include <drm/drm_drv.h>
+#include <drm/drm_dumb_buffers.h>
 #include <drm/drm_gem_ttm_helper.h>
 #include <drm/drm_managed.h>
 #include <drm/ttm/ttm_backup.h>
@@ -2910,14 +2911,13 @@ int xe_bo_dumb_create(struct drm_file *file_priv,
 	struct xe_device *xe = to_xe_device(dev);
 	struct xe_bo *bo;
 	uint32_t handle;
-	int cpp = DIV_ROUND_UP(args->bpp, 8);
 	int err;
 	u32 page_size = max_t(u32, PAGE_SIZE,
 		xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K);
 
-	args->pitch = ALIGN(args->width * cpp, 64);
-	args->size = ALIGN(mul_u32_u32(args->pitch, args->height),
-			   page_size);
+	err = drm_mode_size_dumb(dev, args, SZ_64, page_size);
+	if (err)
+		return err;
 
 	bo = xe_bo_create_user(xe, NULL, NULL, args->size,
 			       DRM_XE_GEM_CPU_CACHING_WC,
-- 
2.48.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

  parent reply	other threads:[~2025-03-11 15:56 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-11 15:47 [PATCH v4 00/25] drm/dumb-buffers: Fix and improve buffer-size calculation Thomas Zimmermann
2025-03-11 15:47 ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 01/25] drm/dumb-buffers: Sanitize output on errors Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-06-12  8:11   ` Tomi Valkeinen
2025-06-12  8:11     ` Tomi Valkeinen
2025-03-11 15:47 ` [PATCH v4 02/25] drm/dumb-buffers: Provide helper to set pitch and size Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-06-12  8:36   ` Tomi Valkeinen
2025-06-12  8:36     ` Tomi Valkeinen
2025-06-13  7:02     ` Thomas Zimmermann
2025-06-13  7:02       ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 03/25] drm/gem-dma: Compute dumb-buffer sizes with drm_mode_size_dumb() Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-06-12  8:43   ` Tomi Valkeinen
2025-06-12  8:43     ` Tomi Valkeinen
2025-06-13  7:15     ` Thomas Zimmermann
2025-06-13  7:15       ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 04/25] drm/gem-shmem: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 05/25] drm/gem-vram: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 06/25] drm/armada: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 07/25] drm/exynos: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 08/25] drm/gma500: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 09/25] drm/hibmc: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 10/25] drm/imx/ipuv3: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 11/25] drm/loongson: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 12/25] drm/mediatek: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 13/25] drm/msm: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 14/25] drm/nouveau: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 15/25] drm/omapdrm: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 16/25] drm/qxl: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 17/25] drm/renesas/rcar-du: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 18/25] drm/renesas/rz-du: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-13  2:15   ` kernel test robot
2025-03-13  2:15     ` kernel test robot
2025-03-13  3:58   ` kernel test robot
2025-03-13  3:58     ` kernel test robot
2025-03-11 15:47 ` [PATCH v4 19/25] drm/rockchip: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 20/25] drm/tegra: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 21/25] drm/virtio: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 22/25] drm/vmwgfx: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` Thomas Zimmermann [this message]
2025-03-11 15:47   ` [PATCH v4 23/25] drm/xe: " Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 24/25] drm/xen: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 15:47 ` [PATCH v4 25/25] drm/xlnx: " Thomas Zimmermann
2025-03-11 15:47   ` Thomas Zimmermann
2025-03-11 17:50 ` ✓ CI.Patch_applied: success for drm/dumb-buffers: Fix and improve buffer-size calculation (rev4) Patchwork
2025-03-11 17:51 ` ✗ CI.checkpatch: warning " Patchwork
2025-03-11 17:52 ` ✓ CI.KUnit: success " Patchwork
2025-03-11 18:09 ` ✓ CI.Build: " Patchwork
2025-03-11 18:11 ` ✓ CI.Hooks: " Patchwork
2025-03-11 18:13 ` ✗ CI.checksparse: warning " Patchwork
2025-03-11 18:33 ` ✓ Xe.CI.BAT: success " Patchwork
2025-03-12 10:10 ` ✗ Xe.CI.Full: failure " Patchwork
2025-05-28  8:23 ` [PATCH v4 00/25] drm/dumb-buffers: Fix and improve buffer-size calculation Thomas Zimmermann
2025-05-28  8:23   ` Thomas Zimmermann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250311155120.442633-24-tzimmermann@suse.de \
    --to=tzimmermann@suse.de \
    --cc=airlied@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=geert@linux-m68k.org \
    --cc=imx@lists.linux.dev \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=lucas.demarchi@intel.com \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=matthew.auld@intel.com \
    --cc=mripard@kernel.org \
    --cc=nouveau@lists.freedesktop.org \
    --cc=rodrigo.vivi@intel.com \
    --cc=simona@ffwll.ch \
    --cc=spice-devel@lists.freedesktop.org \
    --cc=thomas.hellstrom@linux.intel.com \
    --cc=tomi.valkeinen@ideasonboard.com \
    --cc=virtualization@lists.linux.dev \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.