| Message ID | 20240909202521.1018439-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/xe: fix build warning with CONFIG_PM=n | expand |
On Mon, Sep 09, 2024 at 08:25:08PM +0000, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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. > Thank you Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> pushing now... > Fixes: cb85e39dc5d1 ("drm/xe: Suppress missing outer rpm protection warning") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/gpu/drm/xe/xe_pm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c > index 9c59a30d7646..a3d1509066f7 100644 > --- a/drivers/gpu/drm/xe/xe_pm.c > +++ b/drivers/gpu/drm/xe/xe_pm.c > @@ -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 > } > > /** > -- > 2.39.2 >
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c index 9c59a30d7646..a3d1509066f7 100644 --- a/drivers/gpu/drm/xe/xe_pm.c +++ b/drivers/gpu/drm/xe/xe_pm.c @@ -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 } /**