diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index bffe222e1616..fb0815bebe0f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -365,6 +365,12 @@ struct intel_device_info { | |||
365 | u8 has_llc:1; | 365 | u8 has_llc:1; |
366 | }; | 366 | }; |
367 | 367 | ||
368 | enum i915_cache_level { | ||
369 | I915_CACHE_NONE = 0, | ||
370 | I915_CACHE_LLC, | ||
371 | I915_CACHE_LLC_MLC, /* gen6+, in docs at least! */ | ||
372 | }; | ||
373 | |||
368 | /* The Graphics Translation Table is the way in which GEN hardware translates a | 374 | /* The Graphics Translation Table is the way in which GEN hardware translates a |
369 | * Graphics Virtual Address into a Physical Address. In addition to the normal | 375 | * Graphics Virtual Address into a Physical Address. In addition to the normal |
370 | * collateral associated with any va->pa translations GEN hardware also has a | 376 | * collateral associated with any va->pa translations GEN hardware also has a |
@@ -386,6 +392,15 @@ struct i915_gtt { | |||
386 | bool do_idle_maps; | 392 | bool do_idle_maps; |
387 | dma_addr_t scratch_page_dma; | 393 | dma_addr_t scratch_page_dma; |
388 | struct page *scratch_page; | 394 | struct page *scratch_page; |
395 | |||
396 | /* global gtt ops */ | ||
397 | void (*gtt_clear_range)(struct drm_device *dev, | ||
398 | unsigned int first_entry, | ||
399 | unsigned int num_entries); | ||
400 | void (*gtt_insert_entries)(struct drm_device *dev, | ||
401 | struct sg_table *st, | ||
402 | unsigned int pg_start, | ||
403 | enum i915_cache_level cache_level); | ||
389 | }; | 404 | }; |
390 | 405 | ||
391 | #define I915_PPGTT_PD_ENTRIES 512 | 406 | #define I915_PPGTT_PD_ENTRIES 512 |
@@ -1023,12 +1038,6 @@ enum hdmi_force_audio { | |||
1023 | HDMI_AUDIO_ON, /* force turn on HDMI audio */ | 1038 | HDMI_AUDIO_ON, /* force turn on HDMI audio */ |
1024 | }; | 1039 | }; |
1025 | 1040 | ||
1026 | enum i915_cache_level { | ||
1027 | I915_CACHE_NONE = 0, | ||
1028 | I915_CACHE_LLC, | ||
1029 | I915_CACHE_LLC_MLC, /* gen6+, in docs at least! */ | ||
1030 | }; | ||
1031 | |||
1032 | #define I915_GTT_RESERVED ((struct drm_mm_node *)0x1) | 1041 | #define I915_GTT_RESERVED ((struct drm_mm_node *)0x1) |
1033 | 1042 | ||
1034 | struct drm_i915_gem_object_ops { | 1043 | struct drm_i915_gem_object_ops { |