|
@@ -3095,13 +3095,17 @@ int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv)
|
|
|
|
|
|
void i915_ggtt_enable_guc(struct drm_i915_private *i915)
|
|
|
{
|
|
|
+ GEM_BUG_ON(i915->ggtt.invalidate != gen6_ggtt_invalidate);
|
|
|
+
|
|
|
i915->ggtt.invalidate = guc_ggtt_invalidate;
|
|
|
}
|
|
|
|
|
|
void i915_ggtt_disable_guc(struct drm_i915_private *i915)
|
|
|
{
|
|
|
- if (i915->ggtt.invalidate == guc_ggtt_invalidate)
|
|
|
- i915->ggtt.invalidate = gen6_ggtt_invalidate;
|
|
|
+ /* We should only be called after i915_ggtt_enable_guc() */
|
|
|
+ GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
|
|
|
+
|
|
|
+ i915->ggtt.invalidate = gen6_ggtt_invalidate;
|
|
|
}
|
|
|
|
|
|
void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
|