From: "Lisovskiy, Stanislav" <stanislav.lisovskiy@intel.com>
To: "intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
"Saarinen, Jani" <jani.saarinen@intel.com>
Subject: Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev34)
Date: Tue, 5 May 2020 08:51:03 +0000 [thread overview]
Message-ID: <fc6ca4aee36a4aeb80b8193e363123da@intel.com> (raw)
In-Reply-To: <158866626651.25914.3186389294188511073@emeril.freedesktop.org>
As patches 2,3,7 were pushed - can't now send particular patches, because it fails to apply
same patch twice.
So will _have to_ resend the whole series again.
Best Regards,
Lisovskiy Stanislav
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
________________________________________
From: Patchwork <patchwork@emeril.freedesktop.org>
Sent: Tuesday, May 5, 2020 11:11:06 AM
To: Lisovskiy, Stanislav
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev34)
== Series Details ==
Series: SAGV support for Gen12+ (rev34)
URL : https://patchwork.freedesktop.org/series/75129/
State : failure
== Summary ==
Applying: drm/i915: Introduce skl_plane_wm_level accessor.
Applying: drm/i915: Use bw state for per crtc SAGV evaluation
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_bw.h
M drivers/gpu/drm/i915/intel_pm.c
M drivers/gpu/drm/i915/intel_pm.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/display/intel_bw.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915: Use bw state for per crtc SAGV evaluation
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".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-05-05 8:51 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 7:58 [Intel-gfx] [PATCH v26 0/9] SAGV support for Gen12+ Stanislav Lisovskiy
2020-04-23 7:58 ` [Intel-gfx] [PATCH v26 1/9] drm/i915: Introduce skl_plane_wm_level accessor Stanislav Lisovskiy
2020-04-23 7:58 ` [Intel-gfx] [PATCH v26 2/9] drm/i915: Use bw state for per crtc SAGV evaluation Stanislav Lisovskiy
2020-04-30 9:09 ` Ville Syrjälä
2020-04-30 9:13 ` Lisovskiy, Stanislav
2020-04-30 9:25 ` Ville Syrjälä
2020-04-30 9:52 ` Lisovskiy, Stanislav
2020-04-30 10:08 ` Ville Syrjälä
2020-04-30 10:14 ` Lisovskiy, Stanislav
2020-04-30 10:37 ` Ville Syrjälä
2020-04-30 19:17 ` Stanislav Lisovskiy
2020-04-23 7:58 ` [Intel-gfx] [PATCH v26 3/9] drm/i915: Track active_pipes in bw_state Stanislav Lisovskiy
2020-04-30 9:21 ` Ville Syrjälä
2020-04-30 10:05 ` Lisovskiy, Stanislav
2020-04-30 10:32 ` Ville Syrjälä
2020-04-30 10:47 ` Lisovskiy, Stanislav
2020-04-30 10:55 ` Ville Syrjälä
2020-04-30 11:07 ` Lisovskiy, Stanislav
2020-04-30 11:22 ` Ville Syrjälä
2020-04-30 11:29 ` Lisovskiy, Stanislav
2020-04-30 11:40 ` Ville Syrjälä
2020-04-30 11:48 ` Lisovskiy, Stanislav
2020-04-30 19:20 ` Stanislav Lisovskiy
2020-04-30 19:56 ` Stanislav Lisovskiy
2020-04-23 7:58 ` [Intel-gfx] [PATCH v26 4/9] drm/i915: Separate icl and skl SAGV checking Stanislav Lisovskiy
2020-04-30 19:59 ` Stanislav Lisovskiy
2020-04-23 7:58 ` [Intel-gfx] [PATCH v26 5/9] drm/i915: Add TGL+ SAGV support Stanislav Lisovskiy
2020-04-30 20:00 ` Stanislav Lisovskiy
2020-04-23 7:58 ` [Intel-gfx] [PATCH v26 6/9] drm/i915: Added required new PCode commands Stanislav Lisovskiy
2020-05-04 16:12 ` Ville Syrjälä
2020-05-05 7:21 ` Stanislav Lisovskiy
2020-04-23 7:59 ` [Intel-gfx] [PATCH v26 7/9] drm/i915: Rename bw_state to new_bw_state Stanislav Lisovskiy
2020-04-23 7:59 ` [Intel-gfx] [PATCH v26 8/9] drm/i915: Restrict qgv points which don't have enough bandwidth Stanislav Lisovskiy
2020-05-05 7:23 ` Stanislav Lisovskiy
2020-04-23 7:59 ` [Intel-gfx] [PATCH v26 9/9] drm/i915: Enable SAGV support for Gen12 Stanislav Lisovskiy
2020-04-23 9:06 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for SAGV support for Gen12+ (rev27) Patchwork
2020-04-23 9:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-04-23 11:29 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-04-30 22:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for SAGV support for Gen12+ (rev32) Patchwork
2020-05-01 5:52 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-05-05 8:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev34) Patchwork
2020-05-05 8:51 ` Lisovskiy, Stanislav [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=fc6ca4aee36a4aeb80b8193e363123da@intel.com \
--to=stanislav.lisovskiy@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.saarinen@intel.com \
/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