From: Jani Nikula <jani.nikula@intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH] drm/i915: Fix silent conflict from backmerge of drm-next into dinf
Date: Mon, 10 Oct 2016 17:36:16 +0300 [thread overview]
Message-ID: <8760p0s23j.fsf@intel.com> (raw)
In-Reply-To: <87mvics61h.fsf@intel.com>
On Mon, 10 Oct 2016, Jani Nikula <jani.nikula@intel.com> wrote:
> On Mon, 10 Oct 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> Merging from drm-next pulled back in a few lines of dead code due to the
>> code movement around i915_gem_reset(), fix that up.
>
> Actually the problem was introduced in
>
> commit ca09fb9f60b5f3ab2d57e761aaeea89a5147d784
> Merge: 9f4ef05bcdcf 08895a8b6b06
> Author: Dave Airlie <airlied@redhat.com>
> Date: Wed Sep 28 12:08:49 2016 +1000
>
> Merge tag 'v4.8-rc8' into drm-next
>
> and it's present in drm-next, and the conflict wasn't silent.
>
> If this is the right fix (Daniel ack?) I'll queue it with other drm-next
> fixes that I have.
And pushed to drm-intel-next-fixes *only*, with an updated commit
message.
BR,
Jani.
>
>
> BR,
> Jani.
>
>
>>
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> ---
>> drivers/gpu/drm/i915/i915_gem.c | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>> index 981a106901ae..1418c1c522cb 100644
>> --- a/drivers/gpu/drm/i915/i915_gem.c
>> +++ b/drivers/gpu/drm/i915/i915_gem.c
>> @@ -2616,8 +2616,6 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine)
>> list_for_each_entry_continue(request, &engine->request_list, link)
>> if (request->ctx == incomplete_ctx)
>> reset_request(request);
>> -
>> - engine->i915->gt.active_engines &= ~intel_engine_flag(engine);
>> }
>>
>> void i915_gem_reset(struct drm_i915_private *dev_priv)
>> @@ -2628,7 +2626,6 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
>>
>> for_each_engine(engine, dev_priv)
>> i915_gem_reset_engine(engine);
>> - mod_delayed_work(dev_priv->wq, &dev_priv->gt.idle_work, 0);
>>
>> i915_gem_restore_fences(&dev_priv->drm);
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-10-10 14:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-10 12:50 [PATCH] drm/i915: Fix silent conflict from backmerge of drm-next into dinf Chris Wilson
2016-10-10 13:11 ` Jani Nikula
2016-10-10 14:36 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8760p0s23j.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox