diff options
| author | Daniel Vetter | 2015-02-23 12:03:29 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2015-02-27 15:05:30 +0100 |
| commit | 1d03184c7b0753134a2a6fa9c4ed51db5a7ca2f4 (patch) | |
| tree | e364906ef0e63037c9070bb3b3f6ce2a11d8185f /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Remove DRIVER_MODESET checks in the gpu reset code (diff) | |
| download | kernel-qcow2-linux-1d03184c7b0753134a2a6fa9c4ed51db5a7ca2f4.tar.gz kernel-qcow2-linux-1d03184c7b0753134a2a6fa9c4ed51db5a7ca2f4.tar.xz kernel-qcow2-linux-1d03184c7b0753134a2a6fa9c4ed51db5a7ca2f4.zip | |
drm/i915: Remove DRIVER_MODESET checks from gem code
Hooray!
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 14ca4cd5e6d7..be991789df2d 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4594,10 +4594,6 @@ i915_gem_suspend(struct drm_device *dev) i915_gem_retire_requests(dev); - /* Under UMS, be paranoid and evict. */ - if (!drm_core_check_feature(dev, DRIVER_MODESET)) - i915_gem_evict_everything(dev); - i915_gem_stop_ringbuffers(dev); mutex_unlock(&dev->struct_mutex); @@ -4961,18 +4957,8 @@ i915_gem_load(struct drm_device *dev) i915_gem_idle_work_handler); init_waitqueue_head(&dev_priv->gpu_error.reset_queue); - /* On GEN3 we really need to make sure the ARB C3 LP bit is set */ - if (!drm_core_check_feature(dev, DRIVER_MODESET) && IS_GEN3(dev)) { - I915_WRITE(MI_ARB_STATE, - _MASKED_BIT_ENABLE(MI_ARB_C3_LP_WRITE_ENABLE)); - } - dev_priv->relative_constants_mode = I915_EXEC_CONSTANTS_REL_GENERAL; - /* Old X drivers will take 0-2 for front, back, depth buffers */ - if (!drm_core_check_feature(dev, DRIVER_MODESET)) - dev_priv->fence_reg_start = 3; - if (INTEL_INFO(dev)->gen >= 7 && !IS_VALLEYVIEW(dev)) dev_priv->num_fence_regs = 32; else if (INTEL_INFO(dev)->gen >= 4 || IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev)) |