drm/i915: Plop vlv/chv fifo sizes into crtc state
Move the vlv/chv FIFO size tracking into the crtc_state. As with the wms
for now this just acts as temporary storage.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302171508.1666-6-ville.syrjala@linux.intel.com
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6d3323b..26b0ce0 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -508,6 +508,10 @@ struct vlv_wm_state {
bool cxsr;
};
+struct vlv_fifo_state {
+ u16 plane[I915_MAX_PLANES];
+};
+
struct intel_crtc_wm_state {
union {
struct {
@@ -536,6 +540,8 @@ struct intel_crtc_wm_state {
struct {
/* optimal watermarks (inverted) */
struct vlv_wm_state optimal;
+ /* display FIFO split */
+ struct vlv_fifo_state fifo_state;
} vlv;
};
@@ -721,10 +727,6 @@ struct intel_crtc_state {
u8 active_planes;
};
-struct vlv_fifo_state {
- uint16_t plane[I915_MAX_PLANES];
-};
-
struct intel_crtc {
struct drm_crtc base;
enum pipe pipe;
@@ -775,8 +777,6 @@ struct intel_crtc {
/* allow CxSR on this pipe */
bool cxsr_allowed;
-
- struct vlv_fifo_state fifo_state;
} wm;
int scanline_offset;