drm/i915: add render state initialization

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_gem_context.c

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index f77b4c126465e1cec2a63f9f7614a079bc6e0d27..f7ad59e71b368c6a5ebd0d6a5af5438a4817fc08 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -699,6 +699,12 @@ static int do_switch(struct intel_ring_buffer *ring,
                /* obj is kept alive until the next request by its active ref */
                i915_gem_object_ggtt_unpin(from->obj);
                i915_gem_context_unreference(from);
+       } else {
+               if (to->is_initialized == false) {
+                       ret = i915_gem_render_state_init(ring);
+                       if (ret)
+                               DRM_ERROR("init render state: %d\n", ret);
+               }
        }
 
        to->is_initialized = true;