From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: PREEMPT_RT related fixups. (rev4)
Date: Tue, 14 Dec 2021 17:12:13 +0100 [thread overview]
Message-ID: <YbjCXegT1Rk34Uu7@linutronix.de> (raw)
In-Reply-To: <163949752535.24608.15755860466354123203@emeril.freedesktop.org>
On 2021-12-14 15:58:45 [-0000], Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915: PREEMPT_RT related fixups. (rev4)
> URL : https://patchwork.freedesktop.org/series/95463/
> State : failure
>
> == Summary ==
>
> Applying: drm/i915: Drop the irqs_disabled() check
> Applying: drm/i915/gt: Queue and wait for the irq_work item.
> Applying: drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock()
> Applying: drm/i915: Use preempt_disable/enable_rt() where recommended
> Applying: drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates
> Using index info to reconstruct a base tree...
> M drivers/gpu/drm/i915/display/intel_crtc.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/display/intel_crtc.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_crtc.c
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Patch failed at 0005 drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates
> 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".
I used the drm-intel-gt-next branch. Which one would be preferred?
Sebastian
prev parent reply other threads:[~2021-12-14 16:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-14 14:02 [Intel-gfx] [PATCH 0/8] drm/i915: PREEMPT_RT related fixups Sebastian Andrzej Siewior
2021-12-14 14:02 ` Sebastian Andrzej Siewior
2021-12-14 14:02 ` [Intel-gfx] [PATCH 1/8] drm/i915: Drop the irqs_disabled() check Sebastian Andrzej Siewior
2021-12-14 14:02 ` Sebastian Andrzej Siewior
2021-12-14 14:02 ` [Intel-gfx] [PATCH 2/8] drm/i915/gt: Queue and wait for the irq_work item Sebastian Andrzej Siewior
2021-12-14 14:02 ` Sebastian Andrzej Siewior
2021-12-14 14:02 ` [Intel-gfx] [PATCH 3/8] drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock() Sebastian Andrzej Siewior
2021-12-14 14:02 ` Sebastian Andrzej Siewior
2021-12-14 14:02 ` [Intel-gfx] [PATCH 4/8] drm/i915: Use preempt_disable/enable_rt() where recommended Sebastian Andrzej Siewior
2021-12-14 14:02 ` Sebastian Andrzej Siewior
2022-01-26 23:29 ` [Intel-gfx] " Mario Kleiner
2022-01-26 23:29 ` Mario Kleiner
2022-02-11 8:44 ` [Intel-gfx] " Sebastian Andrzej Siewior
2022-02-11 8:44 ` Sebastian Andrzej Siewior
2022-02-14 18:38 ` [Intel-gfx] " Mario Kleiner
2022-02-14 18:38 ` Mario Kleiner
2021-12-14 14:02 ` [Intel-gfx] [PATCH 5/8] drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates Sebastian Andrzej Siewior
2021-12-14 14:02 ` Sebastian Andrzej Siewior
2021-12-14 14:02 ` [Intel-gfx] [PATCH 6/8] drm/i915: Don't check for atomic context on PREEMPT_RT Sebastian Andrzej Siewior
2021-12-14 14:02 ` Sebastian Andrzej Siewior
2021-12-14 14:03 ` [Intel-gfx] [PATCH 7/8] drm/i915: Disable tracing points " Sebastian Andrzej Siewior
2021-12-14 14:03 ` Sebastian Andrzej Siewior
2021-12-14 14:36 ` [Intel-gfx] " Steven Rostedt
2021-12-14 14:36 ` Steven Rostedt
2021-12-14 15:41 ` [Intel-gfx] " Jani Nikula
2021-12-14 15:41 ` Jani Nikula
2021-12-14 15:56 ` [Intel-gfx] " Sebastian Andrzej Siewior
2021-12-14 15:56 ` Sebastian Andrzej Siewior
2021-12-14 16:34 ` [Intel-gfx] " Ville Syrjälä
2021-12-14 16:58 ` Steven Rostedt
2022-02-08 17:32 ` Sebastian Andrzej Siewior
2021-12-14 14:03 ` [Intel-gfx] [PATCH 8/8] drm/i915: skip DRM_I915_LOW_LEVEL_TRACEPOINTS with NOTRACE Sebastian Andrzej Siewior
2021-12-14 14:03 ` Sebastian Andrzej Siewior
2021-12-14 15:58 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: PREEMPT_RT related fixups. (rev4) Patchwork
2021-12-14 16:12 ` Sebastian Andrzej Siewior [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=YbjCXegT1Rk34Uu7@linutronix.de \
--to=bigeasy@linutronix.de \
--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 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.