path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-26 19:23:15 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-26 19:23:15 -1000
commit1a506e473576cdcb922d339aea76b67d0fe344f7 (patch)
treea92289ddf4a7480dd75328321be9c421da74a959 /drivers/gpu/drm/i915/i915_drv.h
parent34a08681832f835269670b1d72e45f48b014375f (diff)
parent426729dcc713b3d1ae802e314030e5556a62da53 (diff)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull i915 drm fixes from Dave Airlie: "These should be the last two fixes for i915, one is for a fence leak killing X on some older GPUs, and one is a late regression partial revert for an swiotlb/xen/i915 interaction, Konrad has promised to figure out the proper answer, and this patch is the best thing to do at this stage to avoid regressing" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/i915: make compact dma scatter lists creation work with SWIOTLB backend. drm/i915: Restore fences after resume and GPU resets
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b9d00dcf9a2..9669a0b8b44 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1697,6 +1697,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
struct drm_gem_object *gem_obj, int flags);
+void i915_gem_restore_fences(struct drm_device *dev);
/* i915_gem_context.c */
void i915_gem_context_init(struct drm_device *dev);
void i915_gem_context_fini(struct drm_device *dev);