Merge drm/drm-next into drm-intel-next

[linux-block.git] / drivers / gpu / drm / i915 / gem / i915_gem_execbuffer.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index c3e41295b6b5b1091e093b64774461350ae15f3d..ffa30d2dd47ff8826d3bb0ee2cda12f0ee673d0b 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -2425,7 +2425,7 @@ gen8_dispatch_bsd_engine(struct drm_i915_private *dev_priv,
        /* Check whether the file_priv has already selected one ring. */
        if ((int)file_priv->bsd_engine < 0)
                file_priv->bsd_engine =
-                       get_random_int() % num_vcs_engines(dev_priv);
+                       prandom_u32_max(num_vcs_engines(dev_priv));
 
        return file_priv->bsd_engine;
 }
@@ -2955,11 +2955,6 @@ await_fence_array(struct i915_execbuffer *eb,
        int err;
 
        for (n = 0; n < eb->num_fences; n++) {
-               struct drm_syncobj *syncobj;
-               unsigned int flags;
-
-               syncobj = ptr_unpack_bits(eb->fences[n].syncobj, &flags, 2);
-
                if (!eb->fences[n].dma_fence)
                        continue;