drm/i915/fbc: Store fence_id directly in fbc cache/params

[linux.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0f318efb92cefc38aecb443638f8e202ffdb16a5..4b2d0901bc9c2e8781a61bcb147bb9480e061117 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -386,9 +386,6 @@ struct intel_fbc {
         * these problems.
         */
        struct intel_fbc_state_cache {
-               struct i915_vma *vma;
-               unsigned long flags;
-
                struct {
                        unsigned int mode_flags;
                        u32 hsw_bdw_pixel_rate;
@@ -418,6 +415,7 @@ struct intel_fbc {
                        unsigned int stride;
                } fb;
                u16 gen9_wa_cfb_stride;
+               s8 fence_id;
        } state_cache;
 
        /*
@@ -428,9 +426,6 @@ struct intel_fbc {
         * are supposed to read from it in order to program the registers.
         */
        struct intel_fbc_reg_params {
-               struct i915_vma *vma;
-               unsigned long flags;
-
                struct {
                        enum pipe pipe;
                        enum i9xx_plane_id i9xx_plane;
@@ -444,6 +439,7 @@ struct intel_fbc {
 
                int cfb_size;
                u16 gen9_wa_cfb_stride;
+               s8 fence_id;
                bool plane_visible;
        } params;