[Intel-gfx] [PATCH 05/43] drm/i915: Refactor common code to load initial power context

Tvrtko Ursulin tvrtko.ursulin at linux.intel.com
Fri Mar 8 06:48:00 UTC 2019


On 07/03/2019 22:26, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2019-03-07 13:19:52)
>>
>> On 06/03/2019 14:24, Chris Wilson wrote:
>>> @@ -4720,19 +4729,10 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915)
>>>    err_active:
>>>        /*
>>>         * If we have to abandon now, we expect the engines to be idle
>>> -      * and ready to be torn-down. First try to flush any remaining
>>> -      * request, ensure we are pointing at the kernel context and
>>> -      * then remove it.
>>> +      * and ready to be torn-down. The quickest way we can accomplish
>>> +      * this is by declaring ourselves wedged.
>>>         */
>>> -     if (WARN_ON(i915_gem_switch_to_kernel_context(i915)))
>>> -             goto out_ctx;
>>> -
>>> -     if (WARN_ON(i915_gem_wait_for_idle(i915,
>>> -                                        I915_WAIT_LOCKED,
>>> -                                        MAX_SCHEDULE_TIMEOUT)))
>>> -             goto out_ctx;
>>> -
>>> -     i915_gem_contexts_lost(i915);
>>
>> Because __intel_engines_record_defaults is only called on module load
>> all of this doesn't matter before wedging?
>>
>>> +     i915_gem_set_wedged(i915);
> 
> It's all redundant as wedging the driver voids the active context and
> enforces idleness.

Okay.

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko



More information about the Intel-gfx mailing list