]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/gem: Use the correct format specifier for resource_size_t
authorAndi Shyti <andi.shyti@linux.intel.com>
Mon, 17 Jun 2024 18:42:43 +0000 (20:42 +0200)
committerAndi Shyti <andi.shyti@linux.intel.com>
Thu, 20 Jun 2024 06:19:41 +0000 (08:19 +0200)
Commit 05da7d9f717b ("drm/i915/gem: Downgrade stolen lmem setup
warning") adds a debug message where the "lmem_size" and
"dsm_base" variables are printed using the %lli identifier.

However, these variables are defined as resource_size_t, which
are unsigned long for 32-bit machines and unsigned long long for
64-bit machines.

The documentation (core-api/printk-formats.rst) recommends using
the %pa specifier for printing addresses and sizes of resources.

Replace %lli with %pa.

This patch also mutes the following sparse warning when compiling
with:

   make W=1 ARCH=i386 drivers/gpu/drm/i915

>> drivers/gpu/drm/i915/gem/i915_gem_stolen.c:941:5: error: format '%lli'
   expects argument of type 'long long int', but argument 5 has type
   'resource_size_t' {aka 'unsigned int'} [-Werror=format=]

Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240617184243.330231-3-andi.shyti@linux.intel.com
drivers/gpu/drm/i915/gem/i915_gem_stolen.c

index 2f22306e9c0a698e49e5d017902883c19270a5c7..903f1e466cf8da05c5e29e0435ffa14a0e749604 100644 (file)
@@ -938,8 +938,8 @@ i915_gem_stolen_lmem_setup(struct drm_i915_private *i915, u16 type,
                dsm_base = intel_uncore_read64(uncore, GEN6_DSMBASE) & GEN11_BDSM_MASK;
                if (lmem_size < dsm_base) {
                        drm_dbg(&i915->drm,
-                               "Disabling stolen memory support due to OOB placement: lmem_size = %lli vs dsm_base = %lli\n",
-                               lmem_size, dsm_base);
+                               "Disabling stolen memory support due to OOB placement: lmem_size = %pa vs dsm_base = %pa\n",
+                               &lmem_size, &dsm_base);
                        return NULL;
                }
                dsm_size = ALIGN_DOWN(lmem_size - dsm_base, SZ_1M);