diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-04-24 10:47:41 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-03 05:18:12 -0400 |
| commit | 1070a42b6bc5cc10a33d2fe22f0b295a0194a582 (patch) | |
| tree | 7cbdeb398d3c957e5d703c7cec4fc55fad7e55f2 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 9797fbfbcfe251b5297b82803002c713e61aa410 (diff) | |
drm/i915: Move GEM initialisation from i915_dma.c to i915_gem.c
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index b0b761f4c23a..2166da1168c1 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -1294,6 +1294,7 @@ int __must_check i915_gem_object_set_domain(struct drm_i915_gem_object *obj, | |||
| 1294 | uint32_t read_domains, | 1294 | uint32_t read_domains, |
| 1295 | uint32_t write_domain); | 1295 | uint32_t write_domain); |
| 1296 | int __must_check i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj); | 1296 | int __must_check i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj); |
| 1297 | int __must_check i915_gem_init(struct drm_device *dev); | ||
| 1297 | int __must_check i915_gem_init_hw(struct drm_device *dev); | 1298 | int __must_check i915_gem_init_hw(struct drm_device *dev); |
| 1298 | void i915_gem_init_swizzling(struct drm_device *dev); | 1299 | void i915_gem_init_swizzling(struct drm_device *dev); |
| 1299 | void i915_gem_init_ppgtt(struct drm_device *dev); | 1300 | void i915_gem_init_ppgtt(struct drm_device *dev); |