From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: intel-gfx@lists.freedesktop.org,
Patchwork <patchwork@emeril.freedesktop.org>,
"Navik, Ankit P" <ankit.p.navik@intel.com>
Subject: Re: ✗ Fi.CI.BAT: failure for Dynamic EU configuration of Slice/Subslice/EU.
Date: Tue, 11 Dec 2018 13:02:06 +0000 [thread overview]
Message-ID: <1d15a9fe-8a53-e208-43b1-e2d882a5aff8@linux.intel.com> (raw)
In-Reply-To: <20181211111238.9784.58541@emeril.freedesktop.org>
On 11/12/2018 11:12, Patchwork wrote:
> == Series Details ==
>
> Series: Dynamic EU configuration of Slice/Subslice/EU.
> URL : https://patchwork.freedesktop.org/series/53876/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: Get active pending request for given context
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/i915_gem_context.c
> M drivers/gpu/drm/i915/i915_gem_context.h
> M drivers/gpu/drm/i915/i915_request.c
> M drivers/gpu/drm/i915/intel_lrc.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_lrc.c
> Auto-merging drivers/gpu/drm/i915/i915_request.c
> Auto-merging drivers/gpu/drm/i915/i915_gem_context.h
> Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
> Applying: drm/i915: Update render power clock state configuration for given context
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/i915_gem_context.c
> M drivers/gpu/drm/i915/i915_gem_context.h
> M drivers/gpu/drm/i915/intel_lrc.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_lrc.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
> Auto-merging drivers/gpu/drm/i915/i915_gem_context.h
> Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
> error: Failed to merge in the changes.
> Patch failed at 0002 drm/i915: Update render power clock state configuration for given context
> Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
Always rebase before sending if you are not sure since drm-tip can be
pretty dynamic.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-12-11 13:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 10:14 [PATCH v3 0/4] Dynamic EU configuration of Slice/Subslice/EU Ankit Navik
2018-12-11 10:14 ` [PATCH v3 1/4] drm/i915: Get active pending request for given context Ankit Navik
2018-12-11 11:58 ` Tvrtko Ursulin
2018-12-11 10:14 ` [PATCH v3 2/4] drm/i915: Update render power clock state configuration " Ankit Navik
2018-12-11 12:36 ` Tvrtko Ursulin
2019-03-14 8:55 ` Ankit Navik
2018-12-11 10:14 ` [PATCH v3 3/4] drm/i915: set optimum eu/slice/sub-slice configuration based on load type Ankit Navik
2018-12-11 12:47 ` Tvrtko Ursulin
2018-12-12 7:36 ` Navik, Ankit P
2018-12-11 10:14 ` [PATCH v3 4/4] drm/i915: Predictive governor to control eu/slice/subslice Ankit Navik
2018-12-11 13:00 ` Tvrtko Ursulin
2018-12-11 11:12 ` ✗ Fi.CI.BAT: failure for Dynamic EU configuration of Slice/Subslice/EU Patchwork
2018-12-11 13:02 ` Tvrtko Ursulin [this message]
2018-12-11 11:48 ` [PATCH v3 0/4] " Tvrtko Ursulin
2018-12-12 7:43 ` Navik, Ankit P
2018-12-14 10:27 ` Joonas Lahtinen
2018-12-14 12:09 ` Navik, Ankit P
-- strict thread matches above, loose matches on Subject: below --
2018-09-21 9:13 [PATCH 0/4][RFC] " kedar.j.karanje
2018-09-21 11:16 ` ✗ Fi.CI.BAT: failure for " Patchwork
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=1d15a9fe-8a53-e208-43b1-e2d882a5aff8@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=ankit.p.navik@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=patchwork@emeril.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.