diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
| commit | f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 (patch) | |
| tree | 474c8fb8df9797b6e0d1e562b389f575c24afc50 /include/uapi/drm/i915_drm.h | |
| parent | ccf953d8f3d68e85e577e843fdcde8872b0a9769 (diff) | |
| parent | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (diff) | |
Merge drm/drm-next into drm-misc-next
Noralf needs some patches in 5.12-rc3, and we've been delaying the 5.12
merge due to the swap issue so it looks like a good time.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/uapi/drm/i915_drm.h')
| -rw-r--r-- | include/uapi/drm/i915_drm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index fa1f3d62f9a6..1987e2ea79a3 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -177,8 +177,9 @@ enum drm_i915_pmu_engine_sample { #define I915_PMU_REQUESTED_FREQUENCY __I915_PMU_OTHER(1) #define I915_PMU_INTERRUPTS __I915_PMU_OTHER(2) #define I915_PMU_RC6_RESIDENCY __I915_PMU_OTHER(3) +#define I915_PMU_SOFTWARE_GT_AWAKE_TIME __I915_PMU_OTHER(4) -#define I915_PMU_LAST I915_PMU_RC6_RESIDENCY +#define I915_PMU_LAST /* Deprecated - do not use */ I915_PMU_RC6_RESIDENCY /* Each region is a minimum of 16k, and there are at most 255 of them. */ |