]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915: don't make assumptions about intel_wakeref_t type
authorJani Nikula <jani.nikula@intel.com>
Thu, 4 Jan 2024 16:46:00 +0000 (18:46 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Wed, 10 Jan 2024 08:42:06 +0000 (10:42 +0200)
intel_wakeref_t is supposed to be a mostly opaque cookie to its
users. It should only be checked for being non-zero and set to
zero. Debug logging its actual value is meaningless. Switch to just
debug logging whether the async_put_wakeref is non-zero.

The issue dates back to much earlier than
commit b49e894c3fd8 ("drm/i915: Replace custom intel runtime_pm tracker
with ref_tracker library"), but this is the one that brought about a
build failure due to the printf format.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/r/20240102111222.2db11208@canb.auug.org.au
Fixes: b49e894c3fd8 ("drm/i915: Replace custom intel runtime_pm tracker with ref_tracker library")
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240104164600.783371-1-jani.nikula@intel.com
(cherry picked from commit de06b42edc5bf05aefbb7e2f59475d6022ed57e1)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/display/intel_display_power.c

index 5f091502719b956a7fc3037ecc473b81ba3455d9..6fd4fa52253a35a02957509d7135310346242d41 100644 (file)
@@ -405,8 +405,8 @@ print_async_put_domains_state(struct i915_power_domains *power_domains)
                                                     struct drm_i915_private,
                                                     display.power.domains);
 
-       drm_dbg(&i915->drm, "async_put_wakeref %lu\n",
-               power_domains->async_put_wakeref);
+       drm_dbg(&i915->drm, "async_put_wakeref: %s\n",
+               str_yes_no(power_domains->async_put_wakeref));
 
        print_power_domains(power_domains, "async_put_domains[0]",
                            &power_domains->async_put_domains[0]);