diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 85e64a45d0bf..05c08b0bc172 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -1882,7 +1882,7 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv, | |||
1882 | struct drm_i915_gem_object *obj; | 1882 | struct drm_i915_gem_object *obj; |
1883 | int ret, i; | 1883 | int ret, i; |
1884 | 1884 | ||
1885 | if (!i915.semaphores) | 1885 | if (!i915_modparams.semaphores) |
1886 | return; | 1886 | return; |
1887 | 1887 | ||
1888 | if (INTEL_GEN(dev_priv) >= 8 && !dev_priv->semaphore) { | 1888 | if (INTEL_GEN(dev_priv) >= 8 && !dev_priv->semaphore) { |
@@ -1982,7 +1982,7 @@ err_obj: | |||
1982 | i915_gem_object_put(obj); | 1982 | i915_gem_object_put(obj); |
1983 | err: | 1983 | err: |
1984 | DRM_DEBUG_DRIVER("Failed to allocate space for semaphores, disabling\n"); | 1984 | DRM_DEBUG_DRIVER("Failed to allocate space for semaphores, disabling\n"); |
1985 | i915.semaphores = 0; | 1985 | i915_modparams.semaphores = 0; |
1986 | } | 1986 | } |
1987 | 1987 | ||
1988 | static void intel_ring_init_irq(struct drm_i915_private *dev_priv, | 1988 | static void intel_ring_init_irq(struct drm_i915_private *dev_priv, |
@@ -2039,7 +2039,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, | |||
2039 | 2039 | ||
2040 | engine->emit_breadcrumb = i9xx_emit_breadcrumb; | 2040 | engine->emit_breadcrumb = i9xx_emit_breadcrumb; |
2041 | engine->emit_breadcrumb_sz = i9xx_emit_breadcrumb_sz; | 2041 | engine->emit_breadcrumb_sz = i9xx_emit_breadcrumb_sz; |
2042 | if (i915.semaphores) { | 2042 | if (i915_modparams.semaphores) { |
2043 | int num_rings; | 2043 | int num_rings; |
2044 | 2044 | ||
2045 | engine->emit_breadcrumb = gen6_sema_emit_breadcrumb; | 2045 | engine->emit_breadcrumb = gen6_sema_emit_breadcrumb; |
@@ -2083,7 +2083,7 @@ int intel_init_render_ring_buffer(struct intel_engine_cs *engine) | |||
2083 | engine->emit_breadcrumb = gen8_render_emit_breadcrumb; | 2083 | engine->emit_breadcrumb = gen8_render_emit_breadcrumb; |
2084 | engine->emit_breadcrumb_sz = gen8_render_emit_breadcrumb_sz; | 2084 | engine->emit_breadcrumb_sz = gen8_render_emit_breadcrumb_sz; |
2085 | engine->emit_flush = gen8_render_ring_flush; | 2085 | engine->emit_flush = gen8_render_ring_flush; |
2086 | if (i915.semaphores) { | 2086 | if (i915_modparams.semaphores) { |
2087 | int num_rings; | 2087 | int num_rings; |
2088 | 2088 | ||
2089 | engine->semaphore.signal = gen8_rcs_signal; | 2089 | engine->semaphore.signal = gen8_rcs_signal; |