summaryrefslogtreecommitdiff
path: root/include/drm/drm_cache.h
diff options
context:
space:
mode:
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>2018-03-01 12:14:24 +0300
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>2018-03-01 12:14:24 +0300
commitbba73071b6f71be0a101658d7c13866e30b264a6 (patch)
tree2a0ea1fc5fd975f1c2e9e50de5bb3cb2cb3cb5f7 /include/drm/drm_cache.h
parentc71b53cc66c5053ff3524a6132f8fc8199d618c3 (diff)
parentf073d78eeb8efd85718e611c15f9a78647751dea (diff)
downloadlinux-bba73071b6f71be0a101658d7c13866e30b264a6.tar.xz
Merge drm-next into drm-intel-next-queued (this time for real)
To pull in the HDCP changes, especially wait_for changes to drm/i915 that Chris wants to build on top of. Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'include/drm/drm_cache.h')
-rw-r--r--include/drm/drm_cache.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_cache.h b/include/drm/drm_cache.h
index beab0f0d0cfb..bfe1639df02d 100644
--- a/include/drm/drm_cache.h
+++ b/include/drm/drm_cache.h
@@ -38,6 +38,8 @@
void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
void drm_clflush_sg(struct sg_table *st);
void drm_clflush_virt_range(void *addr, unsigned long length);
+u64 drm_get_max_iomem(void);
+
static inline bool drm_arch_can_wc_memory(void)
{