All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/pmu: Fix building without CONFIG_PM
@ 2018-02-07 15:55 Tvrtko Ursulin
  2018-02-07 15:58 ` Chris Wilson
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Tvrtko Ursulin @ 2018-02-07 15:55 UTC (permalink / raw)
  To: Intel-gfx; +Cc: David Airlie, Rodrigo Vivi

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

We are peeking into PM internals so have to guard that with
IS_ENABLED(CONFIG_PM) to build where the former is disabled.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@linux.ie>
---
 drivers/gpu/drm/i915/i915_pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index bfc402d47609..a0f56925532e 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -451,7 +451,7 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked)
 
 		if (!locked)
 			spin_unlock_irqrestore(&i915->pmu.lock, flags);
-	} else {
+	} else if (IS_ENABLED(CONFIG_PM)) {
 		struct pci_dev *pdev = i915->drm.pdev;
 		struct device *kdev = &pdev->dev;
 		unsigned long flags2;
-- 
2.14.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-02-07 22:17 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-07 15:55 [PATCH] drm/i915/pmu: Fix building without CONFIG_PM Tvrtko Ursulin
2018-02-07 15:58 ` Chris Wilson
2018-02-07 16:04 ` Chris Wilson
2018-02-07 16:23   ` Tvrtko Ursulin
2018-02-07 16:18 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-02-07 16:36 ` ✓ Fi.CI.BAT: success for drm/i915/pmu: Fix building without CONFIG_PM (rev2) Patchwork
2018-02-07 17:08   ` Chris Wilson
2018-02-07 22:17 ` ✗ Fi.CI.IGT: warning " Patchwork

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.