diff options
| author |  Chris Wilson <chris@chris-wilson.co.uk>
| 2016-07-20 13:31:57 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk>
| 2016-07-20 13:40:43 +0100 |
| commit | 39df91905df3ba2d3a8e1270a30845970c9e2001 (patch) | |
| tree | 9d4f95d16e452615359bc95afb4f266cc0350323 /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | drm/i915: Rename ring->virtual_start as ring->vaddr (diff) | |
| download | linux-39df91905df3ba2d3a8e1270a30845970c9e2001.tar.gz linux-39df91905df3ba2d3a8e1270a30845970c9e2001.tar.bz2 linux-39df91905df3ba2d3a8e1270a30845970c9e2001.zip | |
drm/i915: Convert i915_semaphores_is_enabled over to early sanitize
Rather than recomputing whether semaphores are enabled, we can do that
computation once during early initialisation as the i915.semaphores
module parameter is now read-only.
s/i915_semaphores_is_enabled/i915.semaphores/
v2: Add the state to the debug dmesg as well
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-10-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-9-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 2600939fc2ee..bd13d084e19c 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -556,7 +556,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) u32 flags = hw_flags | MI_MM_SPACE_GTT; const int num_rings = /* Use an extended w/a on ivb+ if signalling from other rings */ - i915_semaphore_is_enabled(dev_priv) ? + i915.semaphores ? hweight32(INTEL_INFO(dev_priv)->ring_mask) - 1 : 0; int len, ret; |