diff options
author | Rafael J. Wysocki | 2019-02-24 21:20:27 +0100 |
---|---|---|
committer | Rafael J. Wysocki | 2019-02-24 21:20:27 +0100 |
commit | 656f72bb2ef33cd832a0f8e80893cce09f3d43df (patch) | |
tree | 9770613baf50a704d50d3221c057b37ed0fc8730 /drivers/gpu/drm/i915/i915_pmu.h | |
parent | PM-runtime: Fix deadlock when canceling hrtimer (diff) | |
parent | PM / core: Add support to skip power management in device/driver model (diff) | |
download | kernel-qcow2-linux-656f72bb2ef33cd832a0f8e80893cce09f3d43df.tar.gz kernel-qcow2-linux-656f72bb2ef33cd832a0f8e80893cce09f3d43df.tar.xz kernel-qcow2-linux-656f72bb2ef33cd832a0f8e80893cce09f3d43df.zip |
Merge back earlier PM core material for v5.1.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_pmu.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_pmu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_pmu.h b/drivers/gpu/drm/i915/i915_pmu.h index b3728c5f13e7..4fc4f2478301 100644 --- a/drivers/gpu/drm/i915/i915_pmu.h +++ b/drivers/gpu/drm/i915/i915_pmu.h @@ -97,9 +97,9 @@ struct i915_pmu { */ struct i915_pmu_sample sample[__I915_NUM_PMU_SAMPLERS]; /** - * @suspended_jiffies_last: Cached suspend time from PM core. + * @suspended_time_last: Cached suspend time from PM core. */ - unsigned long suspended_jiffies_last; + u64 suspended_time_last; /** * @i915_attr: Memory block holding device attributes. */ |