]> git.dujemihanovic.xyz Git - linux.git/commitdiff
drm/xe: fix build warning with CONFIG_PM=n
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 Sep 2024 20:25:08 +0000 (20:25 +0000)
committerLucas De Marchi <lucas.demarchi@intel.com>
Thu, 12 Sep 2024 23:04:36 +0000 (18:04 -0500)
The 'runtime_status' field is an implementation detail of the
power management code, so a device driver should not normally
touch this:

drivers/gpu/drm/xe/xe_pm.c: In function 'xe_pm_suspending_or_resuming':
drivers/gpu/drm/xe/xe_pm.c:606:26: error: 'struct dev_pm_info' has no member named 'runtime_status'
  606 |         return dev->power.runtime_status == RPM_SUSPENDING ||
      |                          ^
drivers/gpu/drm/xe/xe_pm.c:607:27: error: 'struct dev_pm_info' has no member named 'runtime_status'
  607 |                 dev->power.runtime_status == RPM_RESUMING;
      |                           ^
drivers/gpu/drm/xe/xe_pm.c:608:1: error: control reaches end of non-void function [-Werror=return-type]

Add an #ifdef check to avoid the build regression.

Fixes: ad92f5231261 ("drm/xe: Suppress missing outer rpm protection warning")
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240909202521.1018439-1-arnd@kernel.org
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 1c129ed07de47684ff2471e32b52fa823533aa06)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/xe_pm.c

index 9c59a30d764630e91386a1afa722e6e92ed52022..a3d1509066f78ba8f50f2e14afaa57f73367a018 100644 (file)
@@ -601,10 +601,14 @@ bool xe_pm_runtime_get_if_in_use(struct xe_device *xe)
  */
 static bool xe_pm_suspending_or_resuming(struct xe_device *xe)
 {
+#ifdef CONFIG_PM
        struct device *dev = xe->drm.dev;
 
        return dev->power.runtime_status == RPM_SUSPENDING ||
                dev->power.runtime_status == RPM_RESUMING;
+#else
+       return false;
+#endif
 }
 
 /**