diff options
| author | Ben Widawsky | 2012-05-26 01:56:24 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-05-31 12:11:29 +0200 |
| commit | b9524a1e1c48cf461768914345ec94be6a15e710 (patch) | |
| tree | 9edfe87c98ae909dff23b230364cf7011d5d058a /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: enable parity error interrupts (diff) | |
| download | kernel-qcow2-linux-b9524a1e1c48cf461768914345ec94be6a15e710.tar.gz kernel-qcow2-linux-b9524a1e1c48cf461768914345ec94be6a15e710.tar.xz kernel-qcow2-linux-b9524a1e1c48cf461768914345ec94be6a15e710.zip | |
drm/i915: remap l3 on hw init
If any l3 rows have been previously remapped, we must remap them after
GPU reset/resume too.
v2: Just return (no warn) on remapping init if not IVB (Jesse)
Move the check of schizo userspace to i915_gem_l3_remap (Jesse)
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 504f53ee2f8a..470c73219e6b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -656,6 +656,8 @@ typedef struct drm_i915_private { /** PPGTT used for aliasing the PPGTT with the GTT */ struct i915_hw_ppgtt *aliasing_ppgtt; + u32 *l3_remap_info; + struct shrinker inactive_shrinker; /** @@ -1309,6 +1311,7 @@ int __must_check i915_gem_object_set_domain(struct drm_i915_gem_object *obj, int __must_check i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj); int __must_check i915_gem_init(struct drm_device *dev); int __must_check i915_gem_init_hw(struct drm_device *dev); +void i915_gem_l3_remap(struct drm_device *dev); void i915_gem_init_swizzling(struct drm_device *dev); void i915_gem_init_ppgtt(struct drm_device *dev); void i915_gem_cleanup_ringbuffer(struct drm_device *dev); |