aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f2324bc46800..b12d942ab09c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -528,10 +528,12 @@ struct i915_address_space {
528 528
529 /* FIXME: Need a more generic return type */ 529 /* FIXME: Need a more generic return type */
530 gen6_gtt_pte_t (*pte_encode)(dma_addr_t addr, 530 gen6_gtt_pte_t (*pte_encode)(dma_addr_t addr,
531 enum i915_cache_level level); 531 enum i915_cache_level level,
532 bool valid); /* Create a valid PTE */
532 void (*clear_range)(struct i915_address_space *vm, 533 void (*clear_range)(struct i915_address_space *vm,
533 unsigned int first_entry, 534 unsigned int first_entry,
534 unsigned int num_entries); 535 unsigned int num_entries,
536 bool use_scratch);
535 void (*insert_entries)(struct i915_address_space *vm, 537 void (*insert_entries)(struct i915_address_space *vm,
536 struct sg_table *st, 538 struct sg_table *st,
537 unsigned int first_entry, 539 unsigned int first_entry,
@@ -2182,6 +2184,8 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,
2182void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt, 2184void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt,
2183 struct drm_i915_gem_object *obj); 2185 struct drm_i915_gem_object *obj);
2184 2186
2187void i915_check_and_clear_faults(struct drm_device *dev);
2188void i915_gem_suspend_gtt_mappings(struct drm_device *dev);
2185void i915_gem_restore_gtt_mappings(struct drm_device *dev); 2189void i915_gem_restore_gtt_mappings(struct drm_device *dev);
2186int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj); 2190int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj);
2187void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj, 2191void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj,