diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-27 13:21:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-27 13:21:06 -0800 |
| commit | 48a8dd171993569cb77dee0882a47abad47d2837 (patch) | |
| tree | fd4fff8104344def6a9eede903d9d9623208a163 /drivers/gpu/drm/i915/i915_pmu.h | |
| parent | f4b3974602a5b527b22c3a0dc61ba71190ea2aa5 (diff) | |
| parent | e31d941c7dd797df37ea94958638a88723325c30 (diff) | |
| download | linux-48a8dd171993569cb77dee0882a47abad47d2837.tar.bz2 | |
Merge tag 'drm-fixes-2019-12-28' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Dave Airlie:
"Post-xmas food coma recovery fixes. Only three fixes for i915 since I
expect most people are holidaying.
i915:
- power management rc6 fix
- framebuffer tracking fix
- display power management ratelimit fix"
* tag 'drm-fixes-2019-12-28' of git://anongit.freedesktop.org/drm/drm:
drm/i915: Hold reference to intel_frontbuffer as we track activity
drm/i915/gt: Ratelimit display power w/a
drm/i915/pmu: Ensure monotonic rc6
Diffstat (limited to 'drivers/gpu/drm/i915/i915_pmu.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_pmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_pmu.h b/drivers/gpu/drm/i915/i915_pmu.h index bf52e3983631..6c1647c5daf2 100644 --- a/drivers/gpu/drm/i915/i915_pmu.h +++ b/drivers/gpu/drm/i915/i915_pmu.h @@ -18,7 +18,7 @@ enum { __I915_SAMPLE_FREQ_ACT = 0, __I915_SAMPLE_FREQ_REQ, __I915_SAMPLE_RC6, - __I915_SAMPLE_RC6_ESTIMATED, + __I915_SAMPLE_RC6_LAST_REPORTED, __I915_NUM_PMU_SAMPLERS }; |