drm/i915: Move RPS evaluation interval counters to i915->rps
Place the RPS counters inside the RPS struct.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 647ea67..263a879 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -902,10 +902,10 @@
u32 clock_gate_dis2;
};
-struct intel_rps_ei_calc {
- u32 cz_ts_ei;
- u32 render_ei_c0;
- u32 media_ei_c0;
+struct intel_rps_ei {
+ u32 cz_clock;
+ u32 render_c0;
+ u32 media_c0;
};
struct intel_gen6_power_mgmt {
@@ -940,6 +940,9 @@
bool enabled;
struct delayed_work delayed_resume_work;
+ /* manual wa residency calculations */
+ struct intel_rps_ei up_ei, down_ei;
+
/*
* Protects RPS/RC6 register access and PCU communication.
* Must be taken after struct_mutex if nested.
@@ -1534,13 +1537,6 @@
/* gen6+ rps state */
struct intel_gen6_power_mgmt rps;
- /* rps wa up ei calculation */
- struct intel_rps_ei_calc rps_up_ei;
-
- /* rps wa down ei calculation */
- struct intel_rps_ei_calc rps_down_ei;
-
-
/* ilk-only ips/rps state. Everything in here is protected by the global
* mchdev_lock in intel_pm.c */
struct intel_ilk_power_mgmt ips;